--- epiphany-browser-2.21.90.orig/debian/epiphany-gecko.menu +++ epiphany-browser-2.21.90/debian/epiphany-gecko.menu @@ -0,0 +1,6 @@ +?package(epiphany-gecko):needs="x11" \ + section="Applications/Network/Web Browsing" \ + title="Epiphany web browser (Gecko)" \ + longtitle="Epiphany web browser with Gecko backend" \ + command="/usr/bin/epiphany-gecko" \ + hints="Web browsers" --- epiphany-browser-2.21.90.orig/debian/patches/98_xulrunner1.9.patch +++ epiphany-browser-2.21.90/debian/patches/98_xulrunner1.9.patch @@ -0,0 +1,890 @@ +--- + configure.ac | 40 ++++++++- + doc/reference/Makefile.am | 4 + embed/Makefile.am | 1 + embed/mozilla/GtkNSSDialogs.cpp | 19 ++++ + embed/mozilla/Makefile.am | 7 + + embed/mozilla/mozilla-embed-single.cpp | 61 +++++++++++++- + m4/gecko.m4 | 141 ++++++++++++++++++++++++++------- + plugins/desktop-file/Makefile.am | 7 + + src/Makefile.am | 15 +++ + 9 files changed, 260 insertions(+), 35 deletions(-) + +Index: epiphany-browser-2.21.90/configure.ac +=================================================================== +--- epiphany-browser-2.21.90.orig/configure.ac ++++ epiphany-browser-2.21.90/configure.ac +@@ -229,22 +229,54 @@ + fi + + if test "$gecko_cv_gecko_flavour" != "toolkit"; then + AC_MSG_ERROR(["$gecko_cv_gecko_flavour" flavoured geckos aren't tasty enough!]) + fi + + case "$gecko_cv_gecko" in + xulrunner) min_version=1.8 ;; ++libxul*) min_version=1.9 ;; + *firefox) min_version=1.5 ;; + *) AC_MSG_ERROR([Unsupported gecko "$gecko_cv_gecko"]) ;; + esac + + # Added $gecko_cv_gecko-js for debian xulrunner brokenness +-PKG_CHECK_MODULES([GECKO],[${gecko_cv_gecko}-xpcom >= $min_version ${gecko_cv_gecko}-js $gecko_cv_extra_pkg_dependencies]) ++if test $gecko_cv_gecko != "libxul-embedding" -a $gecko_cv_gecko != "libxul"; then ++ PKG_CHECK_MODULES([GECKO],[ ${gecko_cv_gecko}-xpcom >= $min_version ${gecko_cv_gecko}-js $gecko_cv_extra_pkg_dependencies]) ++else ++ GECKO_CFLAGS="$GECKO_CFLAGS -UDEBUG" ++ GECKO_LIBS="$GECKO_LIBS `pkg-config --libs ${gecko_cv_gecko}`" ++fi ++ ++AC_MSG_CHECKING(nspr in gecko) ++if test "$GECKO_NSPR" != yes; then ++ AC_MSG_RESULT(no) ++ AC_MSG_CHECKING(nspr in system) ++ gecko_nspr= ++ if $PKG_CONFIG --exists mozilla-nspr; then ++ gecko_nspr=mozilla-nspr ++ elif $PKG_CONFIG --exists ${gecko_cv_gecko}-nspr; then ++ gecko_nspr=${gecko_cv_gecko}-nspr ++ fi ++ if $PKG_CONFIG --exists nspr; then ++ gecko_nspr=nspr ++ fi ++ if test -z "$gecko_nspr"; then ++ AC_MSG_ERROR([no nspr available]) ++ fi ++ ++ GECKO_CFLAGS="$GECKO_CFLAGS `$PKG_CONFIG --cflags ${gecko_nspr}`" ++ GECKO_LIBS="$GECKO_LIBS `$PKG_CONFIG --libs ${gecko_nspr}`" ++ _GECKO_CFLAGS="$GECKO_CFLAGS" ++ AC_MSG_RESULT(yes) ++else ++ AC_MSG_RESULT(yes) ++fi ++ + AC_SUBST([GECKO_CFLAGS]) + AC_SUBST([GECKO_LIBS]) + + # ***************** + # Weasel UA version + # ***************** + + # FIXMEchpe: find a way to always automatically use the latest weasel minor version! +@@ -558,17 +590,21 @@ + + AC_MSG_CHECKING([whether to build the deskop file plugin]) + AC_ARG_ENABLE([desktop-file-plugin], + AS_HELP_STRING([--disable-desktop-file-plugin],[Disable the desktop file plugin (default: enabled)]), + [],[enable_desktop_file_plugin=yes]) + AC_MSG_RESULT([$enable_desktop_file_plugin]) + + if test "$enable_desktop_file_plugin" = "yes"; then +- PKG_CHECK_MODULES([DESKTOP_FILE_PLUGIN_DEP],[${gecko_cv_gecko}-xpcom ${gecko_cv_gecko}-plugin gtk+-2.0 >= 2.6.0]) ++ if test "${gecko_cv_gecko}" = "libxul-embedding" -o "${gecko_cv_gecko}" = "libxul"; then ++ PKG_CHECK_MODULES([DESKTOP_FILE_PLUGIN_DEP],[${gecko_cv_gecko} mozilla-plugin gtk+-2.0 >= 2.6.0]) ++ else ++ PKG_CHECK_MODULES([DESKTOP_FILE_PLUGIN_DEP],[${gecko_cv_gecko}-xpcom ${gecko_cv_gecko}-plugin gtk+-2.0 >= 2.6.0]) ++ fi + AC_SUBST([DESKTOP_FILE_PLUGIN_DEP_CFLAGS]) + AC_SUBST([DESKTOP_FILE_PLUGIN_DEP_LIBS]) + fi + + if test "$enable_desktop_file_plugin" = "yes"; then + AC_DEFINE([HAVE_PRIVATE_PLUGINS],[1],[Define if any private plugins are enabled]) + fi + +Index: epiphany-browser-2.21.90/doc/reference/Makefile.am +=================================================================== +--- epiphany-browser-2.21.90.orig/doc/reference/Makefile.am ++++ epiphany-browser-2.21.90/doc/reference/Makefile.am +@@ -201,20 +201,20 @@ + DOC_OVERRIDES = + + # include common portion ... + # include $(top_srcdir)/gtk-doc.make + # We need to copy/paste this to be able to change LD_LIBRARY_PATH + + 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 + # which are more like other make's VPATH, when it comes to + # whether a source that is a target of one rule is then + # searched for in VPATH/GPATH. + # + GPATH = $(srcdir) +Index: epiphany-browser-2.21.90/embed/Makefile.am +=================================================================== +--- epiphany-browser-2.21.90.orig/embed/Makefile.am ++++ epiphany-browser-2.21.90/embed/Makefile.am +@@ -112,16 +112,17 @@ + $(NULL) + endif + + if WITH_GECKO_ENGINE + libephyembedfactory_la_CPPFLAGS += -I$(GECKO_INCLUDE_ROOT)/gtkembedmoz + endif + + libephyembedfactory_la_CFLAGS = \ ++ $(GECKO_CFLAGS) \ + $(DEPENDENCIES_CFLAGS) \ + $(AM_CFLAGS) + + CLEANFILES = $(stamp_files) $(BUILT_SOURCES) + DISTCLEANFILES = $(stamp_files) $(BUILT_SOURCES) + MAINTAINERCLEANFILES = $(stamp_files) $(BUILT_SOURCES) + + stamp_files = \ +Index: epiphany-browser-2.21.90/embed/mozilla/GtkNSSDialogs.cpp +=================================================================== +--- epiphany-browser-2.21.90.orig/embed/mozilla/GtkNSSDialogs.cpp ++++ epiphany-browser-2.21.90/embed/mozilla/GtkNSSDialogs.cpp +@@ -386,17 +386,17 @@ + nsIPKCS11Slot *slot = *aSlot; + PRUnichar*slDesc; + slot->GetDesc(&slDesc); + g_print ("Slot description: %s\n", NS_ConvertUTF16toUTF8 (slDesc).get()); + #endif + + return NS_OK; + } +- ++ + #ifdef HAVE_GECKO_1_9 + NS_IMETHODIMP + GtkNSSDialogs::NotifyCertProblem (nsIInterfaceRequestor *socketInfo, + nsISSLStatus *status, + const nsACString &targetSite, + PRBool *_retval) + { + #warning implement me! +@@ -1564,16 +1564,33 @@ + static void + SelectionChangedCallback (GtkComboBox *combo, + GtkDialog *dialog) + { + int active = gtk_combo_box_get_active (combo); + 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, + out wstring tokenName, + out boolean canceled); */ + NS_IMETHODIMP + GtkNSSDialogs::ChooseToken (nsIInterfaceRequestor *aContext, + const PRUnichar **tokenNameList, +Index: epiphany-browser-2.21.90/embed/mozilla/Makefile.am +=================================================================== +--- epiphany-browser-2.21.90.orig/embed/mozilla/Makefile.am ++++ epiphany-browser-2.21.90/embed/mozilla/Makefile.am +@@ -152,12 +152,19 @@ + -DPLUGINDIR=\"$(libexecdir)/$(EPIPHANY_MAJOR)/plugins\" \ + -DMOZILLA_HOME=\"$(GECKO_HOME)\" \ + -DMOZILLA_PREFIX=\"$(GECKO_PREFIX)\" \ + -DMOZILLA_NATIVE_PLUGINSDIR=\"$(libdir)/mozilla/plugins\" \ + -DUA_VERSION=\"$(EPIPHANY_UA_VERSION)\" \ + -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) \ + $(AM_CXXFLAGS) +Index: epiphany-browser-2.21.90/embed/mozilla/mozilla-embed-single.cpp +=================================================================== +--- epiphany-browser-2.21.90.orig/embed/mozilla/mozilla-embed-single.cpp ++++ epiphany-browser-2.21.90/embed/mozilla/mozilla-embed-single.cpp +@@ -28,16 +28,21 @@ + #include + + #include + #include + #include + + #include + ++#ifdef XPCOM_GLUE ++#include ++#include ++#endif ++ + #include + #include + #include + #include + #include + #include + #include + #include +@@ -349,16 +354,17 @@ + + void + mozilla_init_profile (void) + { + char *profile_path; + 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); + } + + #if defined(MOZ_NSIXULCHROMEREGISTRY_SELECTSKIN) || defined(HAVE_CHROME_NSICHROMEREGISTRYSEA_H) + static nsresult + getUILang (nsAString& aUILang) + { +@@ -590,34 +596,85 @@ + /* XPrint? No, thanks! */ + g_unsetenv ("XPSERVERLIST"); + #endif + + #ifdef HAVE_GECKO_1_9 + NS_LogInit (); + #endif + ++ nsresult rv; ++#ifdef XPCOM_GLUE ++ static const GREVersionRange greVersion = { ++ "1.9a", PR_TRUE, ++ "2", PR_TRUE ++ }; ++ char xpcomLocation[4096]; ++ rv = GRE_GetGREPathWithProperties(&greVersion, 1, nsnull, 0, xpcomLocation, 4096); ++ if (NS_FAILED (rv)) ++ { ++ g_warning ("Could not find a suitable GRE!\n"); ++ return FALSE; ++ } ++ ++ // Startup the XPCOM Glue that links us up with XPCOM. ++ rv = XPCOMGlueStartup(xpcomLocation); ++ if (NS_FAILED (rv)) ++ { ++ g_warning ("Could not startup XPCOM glue!\n"); ++ return FALSE; ++ } ++ ++ rv = GTKEmbedGlueStartup(); ++ if (NS_FAILED (rv)) ++ { ++ g_warning ("Could not startup embed glue!\n"); ++ return FALSE; ++ } ++ ++#ifdef GTKEmbedGlueStartupInternal ++ rv = GTKEmbedGlueStartupInternal(); ++ if (NS_FAILED (rv)) ++ { ++ g_warning ("Could not startup internal glue!\n"); ++ return FALSE; ++ } ++#endif ++ ++ 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 (); + + mozilla_init_profile (); + + #ifdef HAVE_GECKO_1_9 + gtk_moz_embed_set_path (MOZILLA_HOME); + #endif + /* Set mozilla binary path */ + gtk_moz_embed_set_comp_path (MOZILLA_HOME); + + nsCOMPtr dp = new EphyDirectoryProvider (); + if (!dp) return FALSE; + + 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 (); + + mozilla_init_single (single); + + if (!mozilla_set_default_prefs (single)) + { +Index: epiphany-browser-2.21.90/m4/gecko.m4 +=================================================================== +--- epiphany-browser-2.21.90.orig/m4/gecko.m4 ++++ epiphany-browser-2.21.90/m4/gecko.m4 +@@ -27,16 +27,17 @@ + # + # Checks whether the gecko build is a debug build, and adds + # debug flags to AM_CXXFLAGS if it is. + # + # Expanded variables: + # VARIABLE: Which gecko was found (e.g. "xulrunnner", "seamonkey", ...) + # VARIABLE_FLAVOUR: The flavour of the gecko that was found + # VARIABLE_HOME: ++# VARIABLE_NSPR: set if nspr is provided by gecko flags + # VARIABLE_PREFIX: + # VARIABLE_INCLUDE_ROOT: + # VARIABLE_VERSION: The version of the gecko that was found + # VARIABLE_VERSION: + # VARIABLE_VERSION_INT: + + AC_DEFUN([GECKO_INIT], + [AC_REQUIRE([PKG_PROG_PKG_CONFIG])dnl +@@ -46,77 +47,101 @@ + + # ************************ + # Check which gecko to use + # ************************ + + AC_MSG_CHECKING([which gecko to use]) + + AC_ARG_WITH([gecko], +- AS_HELP_STRING([--with-gecko@<:@=mozilla|firefox|seamonkey|xulrunner@:>@], ++ AS_HELP_STRING([--with-gecko@<:@=mozilla|firefox|seamonkey|xulrunner|libxul-embedding|libxul@:>@], + [Which gecko engine to use (autodetected by default)])) + + # Backward compat + AC_ARG_WITH([mozilla],[],[with_gecko=$withval],[]) + + gecko_cv_gecko=$with_gecko + + # Autodetect gecko +-_geckos="xulrunner firefox mozilla-firefox seamonkey mozilla" ++_geckos="xulrunner firefox mozilla-firefox seamonkey mozilla libxul-embedding libxul" + if test -z "$gecko_cv_gecko"; then + for lizard in $_geckos; do + if $PKG_CONFIG --exists $lizard-xpcom; then + gecko_cv_gecko=$lizard + break; ++ elif $PKG_CONFIG --exists $lizard-unstable; then ++ gecko_cv_gecko=$lizard ++ break; + fi + done + fi + + AC_MSG_RESULT([$gecko_cv_gecko]) + + if test "x$gecko_cv_gecko" = "x"; then + ifelse([$3],,[AC_MSG_ERROR([No gecko found; you may need to adjust PKG_CONFIG_PATH or install a mozilla/firefox/xulrunner -devel package])],[$3]) + gecko_cv_have_gecko=no + elif ! ( echo "$_geckos" | egrep "(^| )$gecko_cv_gecko(\$| )" > /dev/null); then + AC_MSG_ERROR([Unknown gecko "$gecko_cv_gecko" specified]) + else + ifelse([$2],,[],[$2]) + gecko_cv_have_gecko=yes + fi + ++AC_MSG_CHECKING([manual gecko home set]) ++ ++AC_ARG_WITH([gecko-home], ++ AS_HELP_STRING([--with-gecko-home@<:@=[path]@:>@], ++ [Manually set MOZILLA_FIVE_HOME])) ++ ++gecko_cv_gecko_home=$with_gecko_home ++ + # **************** + # Define variables + # **************** + + if test "$gecko_cv_have_gecko" = "yes"; then + + case "$gecko_cv_gecko" in + mozilla) gecko_cv_gecko_flavour=mozilla ;; + seamonkey) gecko_cv_gecko_flavour=mozilla ;; + *firefox) gecko_cv_gecko_flavour=toolkit ;; + xulrunner) gecko_cv_gecko_flavour=toolkit ;; ++libxul*) gecko_cv_gecko_flavour=toolkit ;; + esac + +-_GECKO_INCLUDE_ROOT="`$PKG_CONFIG --variable=includedir ${gecko_cv_gecko}-xpcom`" +-_GECKO_LIBDIR="`$PKG_CONFIG --variable=libdir ${gecko_cv_gecko}-xpcom`" +-_GECKO_HOME="`$PKG_CONFIG --variable=libdir ${gecko_cv_gecko}-xpcom`" +-_GECKO_PREFIX="`$PKG_CONFIG --variable=prefix ${gecko_cv_gecko}-xpcom`" +- ++if $PKG_CONFIG --exists ${gecko_cv_gecko}-xpcom; then ++ _GECKO_INCLUDE_ROOT="`$PKG_CONFIG --variable=includedir ${gecko_cv_gecko}-xpcom`" ++ _GECKO_CFLAGS="-I$_GECKO_INCLUDE_ROOT" ++ _GECKO_LIBDIR="`$PKG_CONFIG --variable=libdir ${gecko_cv_gecko}-xpcom`" ++ _GECKO_HOME="`$PKG_CONFIG --variable=libdir ${gecko_cv_gecko}-xpcom`" ++ _GECKO_PREFIX="`$PKG_CONFIG --variable=prefix ${gecko_cv_gecko}-xpcom`" ++ _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 --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}`" ++ _GECKO_NSPR=no # XXX asac: this is currently a blind guess and should be a AC test ++fi + fi # if gecko_cv_have_gecko + + if test "$gecko_cv_gecko_flavour" = "toolkit"; then + AC_DEFINE([HAVE_MOZILLA_TOOLKIT],[1],[Define if mozilla is of the toolkit flavour]) + fi + + $1[]=$gecko_cv_gecko + $1[]_FLAVOUR=$gecko_cv_gecko_flavour + $1[]_INCLUDE_ROOT=$_GECKO_INCLUDE_ROOT ++$1[]_CFLAGS=$_GECKO_CFLAGS + $1[]_LIBDIR=$_GECKO_LIBDIR + $1[]_HOME=$_GECKO_HOME + $1[]_PREFIX=$_GECKO_PREFIX ++$1[]_NSPR=$_GECKO_NSPR + + # ************************************************************** + # This is really gcc-only + # Do this test using CXX only since some versions of gcc + # 2.95-2.97 have a signed wchar_t in c++ only and some versions + # only have short-wchar support for c++. + # ************************************************************** + +@@ -177,17 +202,17 @@ + # Various tests + # ************* + + if test "$gecko_cv_have_gecko" = "yes"; then + + AC_LANG_PUSH([C++]) + + _SAVE_CPPFLAGS="$CPPFLAGS" +-CPPFLAGS="$CPPFLAGS $_GECKO_EXTRA_CPPFLAGS -I$_GECKO_INCLUDE_ROOT" ++CPPFLAGS="$CPPFLAGS $_GECKO_EXTRA_CPPFLAGS $_GECKO_CFLAGS" + + AC_MSG_CHECKING([[whether we have a gtk 2 gecko build]]) + AC_RUN_IFELSE( + [AC_LANG_SOURCE( + [[#include + #include + #include + int main(void) { +@@ -210,40 +235,58 @@ + #if !defined(MOZ_REFLOW_PERF) || !defined(MOZ_REFLOW_PERF_DSP) + #error No + #endif]] + )], + [gecko_cv_have_debug=yes], + [gecko_cv_have_debug=no]) + AC_MSG_RESULT([$gecko_cv_have_debug]) + ++AC_MSG_CHECKING([[whether we have a xpcom glue]]) ++AC_COMPILE_IFELSE( ++ [AC_LANG_SOURCE( ++ [[ ++ #ifndef XPCOM_GLUE ++ #error "no xpcom glue found" ++ #endif]] ++ )], ++ [gecko_cv_have_xpcom_glue=yes], ++ [gecko_cv_have_xpcom_glue=no]) ++AC_MSG_RESULT([$gecko_cv_have_xpcom_glue]) ++ + CPPFLAGS="$_SAVE_CPPFLAGS" + + AC_LANG_POP([C++]) + + if test "$gecko_cv_have_debug" = "yes"; then + _GECKO_EXTRA_CXXFLAGS="$_GECKO_EXTRA_CXXFLAGS -DDEBUG -D_DEBUG" + AM_CXXFLAGS="-DDEBUG -D_DEBUG $AM_CXXFLAGS" + + AC_DEFINE([HAVE_GECKO_DEBUG],[1],[Define if gecko is a debug build]) + fi + ++if test "$gecko_cv_have_xpcom_glue" = "yes"; then ++ AC_DEFINE([HAVE_GECKO_XPCOM_GLUE],[1],[Define if xpcom glue is used]) ++fi ++ + fi # if gecko_cv_have_gecko + ++AM_CONDITIONAL([HAVE_GECKO_DEBUG],[test "$gecko_cv_have_debug" = "yes"]) ++AM_CONDITIONAL([HAVE_GECKO_XPCOM_GLUE],[test "$gecko_cv_have_xpcom_glue" = "yes"]) + + # *********************** + # Check for gecko version + # *********************** + + if test "$gecko_cv_have_gecko" = "yes"; then + + AC_LANG_PUSH([C++]) + + _SAVE_CPPFLAGS="$CPPFLAGS" +-CPPFLAGS="$CPPFLAGS -I$_GECKO_INCLUDE_ROOT" ++CPPFLAGS="$CPPFLAGS $_GECKO_CFLAGS" + + AC_CACHE_CHECK([for gecko version], + [gecko_cv_gecko_version], + [AC_RUN_IFELSE( + [AC_LANG_PROGRAM([[ + #include + #include + #include +@@ -315,18 +358,21 @@ + # Packages that we need to check for with pkg-config + # ************************************************** + + gecko_cv_extra_libs= + gecko_cv_glue_libs= + gecko_cv_extra_pkg_dependencies= + + if test "$gecko_cv_gecko_version_int" -ge "1009000"; then +- gecko_cv_extra_libs="-L$_GECKO_LIBDIR -lxul" +- gecko_cv_glue_libs="-L$_GECKO_LIBDIR -lxpcomglue_s" ++ if ! test "$gecko_cv_have_xpcom_glue" = "yes"; then ++ gecko_cv_extra_libs="-L$_GECKO_LIBDIR -lxul" ++ else ++ gecko_cv_glue_libs="-L$_GECKO_LIBDIR -lxpcomglue" ++ fi + else + gecko_cv_extra_pkg_dependencies="${gecko_cv_gecko}-gtkmozembed" + fi + + $1[]_EXTRA_PKG_DEPENDENCIES="$gecko_cv_extra_pkg_dependencies" + $1[]_EXTRA_LIBS="$gecko_cv_extra_libs" + $1[]_GLUE_LIBS="$gecko_cv_glue_libs" + +@@ -345,16 +391,17 @@ + gecko_cv_gecko_version_int=0 + fi + AM_CONDITIONAL([HAVE_MOZILLA_TOOLKIT],[test "$gecko_cv_have_gecko" = "yes" -a "$gecko_cv_gecko_flavour" = "toolkit"]) + AM_CONDITIONAL([HAVE_GECKO_DEBUG],[test "$gecko_cv_have_gecko" = "yes" -a "$gecko_cv_have_debug" = "yes"]) + AM_CONDITIONAL([HAVE_GECKO_1_7],[test "$gecko_cv_have_gecko" = "yes" -a "$gecko_cv_gecko_version_int" -ge "1007000"]) + 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"]) ++AM_CONDITIONAL([HAVE_GECKO_HOME],[test "x$_GECKO_HOME" != "x"]) + ]) + + # *************************************************************************** + # *************************************************************************** + # *************************************************************************** + + # _GECKO_DISPATCH(MACRO, INCLUDEDIRS, ...) + +@@ -366,31 +413,43 @@ + fi + + AC_LANG_PUSH([C++]) + + _SAVE_CPPFLAGS="$CPPFLAGS" + _SAVE_CXXFLAGS="$CXXFLAGS" + _SAVE_LDFLAGS="$LDFLAGS" + _SAVE_LIBS="$LIBS" +-CPPFLAGS="$CPPFLAGS $_GECKO_EXTRA_CPPFLAGS -I$_GECKO_INCLUDE_ROOT $($PKG_CONFIG --cflags-only-I ${gecko_cv_gecko}-xpcom)" +-CXXFLAGS="$CXXFLAGS $_GECKO_EXTRA_CXXFLAGS $($PKG_CONFIG --cflags-only-other ${gecko_cv_gecko}-xpcom)" +-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 --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)" ++ CXXFLAGS="$CXXFLAGS $_GECKO_EXTRA_CXXFLAGS $_GECKO_CFLAGS $($PKG_CONFIG --cflags-only-other ${gecko_cv_gecko}-xpcom)" ++ LIBS="$LIBS $($PKG_CONFIG --libs ${gecko_cv_gecko}-xpcom)" ++fi ++if test -n "$_GECKO_HOME"; then ++ LDFLAGS="$LDFLAGS $_GECKO_EXTRA_LDFLAGS -Wl,--rpath=$_GECKO_HOME" ++else ++ LDFLAGS="$LDFLAGS $_GECKO_EXTRA_LDFLAGS" ++fi + + _GECKO_DISPATCH_INCLUDEDIRS="$2" + + # Sigh Gentoo has a rubbish header layout + # http://bugs.gentoo.org/show_bug.cgi?id=100804 + # Mind you, it's useful to be able to test against uninstalled mozilla builds... + _GECKO_DISPATCH_INCLUDEDIRS="$_GECKO_DISPATCH_INCLUDEDIRS dom necko pref" + +-# Now add them to CPPFLAGS ++# Now add them to CPPFLAGS - asac: well ... not anymore since 1.9 -> test whether they exist before adding. + for i in $_GECKO_DISPATCH_INCLUDEDIRS; do +- CPPFLAGS="$CPPFLAGS -I$_GECKO_INCLUDE_ROOT/$i" ++ if test -d "$_GECKO_INCLUDE_ROOT/$i"; then ++ CPPFLAGS="$CPPFLAGS -I$_GECKO_INCLUDE_ROOT/$i" ++ fi + done + + m4_indir([$1],m4_shiftn(2,$@)) + + CPPFLAGS="$_SAVE_CPPFLAGS" + CXXFLAGS="$_SAVE_CXXFLAGS" + LDFLAGS="$_SAVE_LDFLAGS" + LIBS="$_SAVE_LIBS" +@@ -433,38 +492,65 @@ + # + # To jump out of the BODY and exit the test program, you can use |break|. + + AC_DEFUN([GECKO_XPCOM_PROGRAM], + [AC_LANG_PROGRAM([[ + #include + #include + #include ++ ++#ifdef XPCOM_GLUE ++#include ++#else + #include ++#endif // XPCOM_GLUE ++ + #include + #include + #include +-#ifdef HAVE_GECKO_1_8 ++#if defined(HAVE_GECKO_1_8) || defined(HAVE_GECKO_1_9) + #include + #else + #include + #endif + ]] + [$1], + [[ ++ ++nsresult rv; ++#ifdef XPCOM_GLUE ++ static const GREVersionRange greVersion = { ++ "1.8", PR_TRUE, ++ "1.9.*", PR_TRUE ++ }; ++ char xpcomLocation[4096]; ++ rv = GRE_GetGREPathWithProperties(&greVersion, 1, nsnull, 0, xpcomLocation, 4096); ++ if (NS_FAILED(rv)) { ++ exit(123); ++ } ++ ++ // Startup the XPCOM Glue that links us up with XPCOM. ++ XPCOMGlueStartup(xpcomLocation); ++ if (NS_FAILED(rv)) { ++ exit(124); ++ } ++#endif // XPCOM_GLUE ++ + // redirect unwanted mozilla debug output to the bit bucket + freopen ("/dev/null", "w", stdout); + +-nsresult rv; +-nsCOMPtr directory; ++nsCOMPtr directory = nsnull; ++#ifndef XPCOM_GLUE + rv = NS_NewNativeLocalFile (NS_LITERAL_CSTRING("$_GECKO_HOME"), PR_FALSE, + getter_AddRefs (directory)); + if (NS_FAILED (rv) || !directory) { + exit (126); + } ++#endif + + rv = NS_InitXPCOM2 (nsnull, directory, nsnull); + if (NS_FAILED (rv)) { + exit (125); + } + + int status = EXIT_FAILURE; + +@@ -602,31 +688,32 @@ + # + # Variables set: + # XPIDL: the xpidl program + # XPIDL_IDLDIR: the xpidl include directory + + AC_DEFUN([GECKO_XPIDL], + [AC_REQUIRE([GECKO_INIT])dnl + +-_GECKO_LIBDIR="`$PKG_CONFIG --variable=libdir ${gecko_cv_gecko}-xpcom`" ++if test ${gecko_cv_gecko} = "libxul-embedding" -o ${gecko_cv_gecko} = "libxul"; then ++ _GECKO_LIBDIR="`$PKG_CONFIG pkg-config --variable=sdkdir ${gecko_cv_gecko}`/bin" ++else ++ _GECKO_LIBDIR="`$PKG_CONFIG --variable=libdir ${gecko_cv_gecko}-xpcom`" ++fi + + AC_PATH_PROG([XPIDL],[xpidl],[no],[$_GECKO_LIBDIR:$PATH]) + ++if test ${gecko_cv_gecko} = "libxul-embedding" -o ${gecko_cv_gecko} = "libxul"; then ++XPIDL_IDLDIR="`$PKG_CONFIG --variable=idldir ${gecko_cv_gecko}`" ++else + XPIDL_IDLDIR="`$PKG_CONFIG --variable=idldir ${gecko_cv_gecko}-xpcom`" +- +-# Older geckos don't have this variable, see +-# https://bugzilla.mozilla.org/show_bug.cgi?id=240473 +- + if test -z "$XPIDL_IDLDIR" -o ! -f "$XPIDL_IDLDIR/nsISupports.idl"; then + XPIDL_IDLDIR="`echo $_GECKO_LIBDIR | sed -e s!lib!share/idl!`" + fi +- + # Some distributions (Gentoo) have it in unusual places +- + if test -z "$XPIDL_IDLDIR" -o ! -f "$XPIDL_IDLDIR/nsISupports.idl"; then + XPIDL_IDLDIR="$_GECKO_INCLUDE_ROOT/idl" + fi + + if test "$XPIDL" != "no" -a -n "$XPIDL_IDLDIR" -a -f "$XPIDL_IDLDIR/nsISupports.idl"; then + ifelse([$1],,[:],[$1]) + else + ifelse([$2],,[AC_MSG_FAILURE([XPIDL program or include directory not found])],[$2]) +Index: epiphany-browser-2.21.90/plugins/desktop-file/Makefile.am +=================================================================== +--- epiphany-browser-2.21.90.orig/plugins/desktop-file/Makefile.am ++++ epiphany-browser-2.21.90/plugins/desktop-file/Makefile.am +@@ -20,13 +20,18 @@ + $(AM_CXXFLAGS) + + libdesktopfileplugin_la_LIBADD = \ + $(DESKTOP_FILE_PLUGIN_DEP_LIBS) + + 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: epiphany-browser-2.21.90/src/Makefile.am +=================================================================== +--- epiphany-browser-2.21.90.orig/src/Makefile.am ++++ epiphany-browser-2.21.90/src/Makefile.am +@@ -182,30 +182,41 @@ + + libpyphany_la_LIBADD = \ + $(DEPENDENCIES_LIBS) \ + $(PYTHON_LIB_LOC) $(PYTHON_LIBS) \ + $(PYTHON_EXTRA_LIBS) \ + $(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 ++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 = \ + -I$(top_builddir)/lib \ + -I$(top_srcdir)/embed \ + -I$(top_srcdir)/lib \ + -I$(top_srcdir)/src/bookmarks \ + -DDATADIR=\""$(datadir)"\" \ + -DGNOMELOCALEDIR=\"$(datadir)/locale\" \ + $(INCINTL) \ + $(AM_CPPFLAGS) + + epiphany_CFLAGS = \ + $(DEPENDENCIES_CFLAGS) \ ++ $(GECKO_CFLAGS) \ + $(DBUS_CFLAGS) \ + $(AM_CFLAGS) + + epiphany_LDFLAGS = -dlopen self + + epiphany_LDADD = \ + libephymain.la \ + $(top_builddir)/src/bookmarks/libephybookmarks.la \ +@@ -216,16 +227,17 @@ + $(top_builddir)/embed/xulrunner/utils/libephyxulrunnerutils.la \ + $(top_builddir)/embed/xulrunner/src/libgnomegeckoembed.la \ + $(top_builddir)/embed/xulrunner/embed/libephyxulrunnerembed.la \ + $(top_builddir)/embed/xulrunner/components/libephycomponents.la + endif + + if WITH_GECKO_ENGINE + epiphany_LDADD += \ ++ $(GECKO_LIBS) \ + $(top_builddir)/embed/mozilla/libephymozillaembed.la + endif + + if WITH_WEBKIT_ENGINE + epiphany_LDADD += \ + $(top_builddir)/embed/webkit/libephywebkitembed.la + endif + +@@ -236,30 +248,33 @@ + $(top_builddir)/lib/egg/libegg.la + + if WITH_XULRUNNER_ENGINE + epiphany_LDFLAGS += -R$(LIBXUL_LIBDIR) + epiphany_LDADD += $(LIBXUL_LIBS) -lxpcomglue + endif + + if WITH_GECKO_ENGINE ++if !HAVE_GECKO_XPCOM_GLUE + epiphany_LDFLAGS += -R$(GECKO_HOME) ++endif + + epiphany_LDADD += \ + $(GECKO_LIBS) \ + $(GECKO_EXTRA_LIBS) \ + $(GECKO_GLUE_LIBS) + endif + + if WITH_WEBKIT_ENGINE + epiphany_LDADD += \ + $(WEBKIT_LIBS) + endif + + epiphany_LDADD += \ ++ $(GECKO_LIBS) \ + $(DEPENDENCIES_LIBS) \ + $(DBUS_LIBS) \ + $(LIBINTL) + + if ENABLE_PYTHON + epiphany_LDADD += \ + libpyphany.la \ + $(PYTHON_LIB_LOC) $(PYTHON_LIBS) \ --- epiphany-browser-2.21.90.orig/debian/patches/05_libexecdir.patch +++ epiphany-browser-2.21.90/debian/patches/05_libexecdir.patch @@ -0,0 +1,142 @@ +Index: epiphany-2.20.0/data/epiphany.pc.in +=================================================================== +--- epiphany-2.20.0.orig/data/epiphany.pc.in 2007-09-21 14:41:49.966965277 +0200 ++++ epiphany-2.20.0/data/epiphany.pc.in 2007-09-21 14:45:51.976756629 +0200 +@@ -2,8 +2,8 @@ + exec_prefix=@exec_prefix@ + libdir=@libdir@ + includedir=@includedir@/epiphany/@EPIPHANY_MAJOR@ +-extensionsdir=@libdir@/epiphany/@EPIPHANY_MAJOR@/extensions +-loaderdir=@libdir@/epiphany/@EPIPHANY_MAJOR@/loaders ++extensionsdir=@libexecdir@/@EPIPHANY_MAJOR@/extensions ++loaderdir=@libexecdir@/@EPIPHANY_MAJOR@/loaders + datarootdir=@datarootdir@ + datadir=@datadir@ + icondir=@datadir@/@PACKAGE@/icons +Index: epiphany-2.20.0/embed/mozilla/Makefile.am +=================================================================== +--- epiphany-2.20.0.orig/embed/mozilla/Makefile.am 2007-09-21 14:41:35.286128664 +0200 ++++ epiphany-2.20.0/embed/mozilla/Makefile.am 2007-09-21 14:44:45.804985715 +0200 +@@ -141,7 +141,7 @@ + -I$(top_srcdir) \ + $(addprefix -I$(GECKO_INCLUDE_ROOT)/,$(mozilla_include_subdirs)) \ + -DSHARE_DIR=\"$(pkgdatadir)\" \ +- -DPLUGINDIR=\"$(libdir)/epiphany/$(EPIPHANY_MAJOR)/plugins\" \ ++ -DPLUGINDIR=\"$(libexecdir)/$(EPIPHANY_MAJOR)/plugins\" \ + -DMOZILLA_HOME=\"$(GECKO_HOME)\" \ + -DMOZILLA_PREFIX=\"$(GECKO_PREFIX)\" \ + -DMOZILLA_NATIVE_PLUGINSDIR=\"$(libdir)/mozilla/plugins\" \ +Index: epiphany-2.20.0/embed/mozilla/Makefile.in +=================================================================== +--- epiphany-2.20.0.orig/embed/mozilla/Makefile.in 2007-09-21 14:41:35.326130943 +0200 ++++ epiphany-2.20.0/embed/mozilla/Makefile.in 2007-09-21 14:44:45.816986398 +0200 +@@ -461,7 +461,7 @@ + -I$(top_srcdir) \ + $(addprefix -I$(GECKO_INCLUDE_ROOT)/,$(mozilla_include_subdirs)) \ + -DSHARE_DIR=\"$(pkgdatadir)\" \ +- -DPLUGINDIR=\"$(libdir)/epiphany/$(EPIPHANY_MAJOR)/plugins\" \ ++ -DPLUGINDIR=\"$(libexecdir)/$(EPIPHANY_MAJOR)/plugins\" \ + -DMOZILLA_HOME=\"$(GECKO_HOME)\" \ + -DMOZILLA_PREFIX=\"$(GECKO_PREFIX)\" \ + -DMOZILLA_NATIVE_PLUGINSDIR=\"$(libdir)/mozilla/plugins\" \ +Index: epiphany-2.20.0/lib/Makefile.am +=================================================================== +--- epiphany-2.20.0.orig/lib/Makefile.am 2007-09-21 14:41:42.814557684 +0200 ++++ epiphany-2.20.0/lib/Makefile.am 2007-09-21 14:44:45.816986398 +0200 +@@ -76,7 +76,7 @@ + libephymisc_la_CPPFLAGS = \ + -I$(top_builddir)/lib \ + -DSHARE_DIR=\"$(pkgdatadir)\" \ +- -DEXTENSIONS_DIR=\""$(libdir)/epiphany/$(EPIPHANY_MAJOR)/extensions"\" \ ++ -DEXTENSIONS_DIR=\""$(libexecdir)/$(EPIPHANY_MAJOR)/extensions"\" \ + $(AM_CPPFLAGS) + + libephymisc_la_CFLAGS = \ +Index: epiphany-2.20.0/lib/Makefile.in +=================================================================== +--- epiphany-2.20.0.orig/lib/Makefile.in 2007-09-21 14:41:42.854559964 +0200 ++++ epiphany-2.20.0/lib/Makefile.in 2007-09-21 14:44:45.828987082 +0200 +@@ -409,7 +409,7 @@ + libephymisc_la_CPPFLAGS = \ + -I$(top_builddir)/lib \ + -DSHARE_DIR=\"$(pkgdatadir)\" \ +- -DEXTENSIONS_DIR=\""$(libdir)/epiphany/$(EPIPHANY_MAJOR)/extensions"\" \ ++ -DEXTENSIONS_DIR=\""$(libexecdir)/$(EPIPHANY_MAJOR)/extensions"\" \ + $(AM_CPPFLAGS) + + libephymisc_la_CFLAGS = $(DEPENDENCIES_CFLAGS) $(AM_CFLAGS) \ +Index: epiphany-2.20.0/plugins/desktop-file/Makefile.am +=================================================================== +--- epiphany-2.20.0.orig/plugins/desktop-file/Makefile.am 2007-09-21 14:41:24.741527761 +0200 ++++ epiphany-2.20.0/plugins/desktop-file/Makefile.am 2007-09-21 14:44:45.800985487 +0200 +@@ -1,4 +1,4 @@ +-plugindir = $(libdir)/epiphany/$(EPIPHANY_MAJOR)/plugins ++plugindir = $(libexecdir)/$(EPIPHANY_MAJOR)/plugins + plugin_LTLIBRARIES = libdesktopfileplugin.la + + libdesktopfileplugin_la_SOURCES = \ +Index: epiphany-2.20.0/plugins/desktop-file/Makefile.in +=================================================================== +--- epiphany-2.20.0.orig/plugins/desktop-file/Makefile.in 2007-09-21 14:41:24.781530041 +0200 ++++ epiphany-2.20.0/plugins/desktop-file/Makefile.in 2007-09-21 14:44:45.804985715 +0200 +@@ -295,7 +295,7 @@ + top_builddir = @top_builddir@ + top_srcdir = @top_srcdir@ + with_engine = @with_engine@ +-plugindir = $(libdir)/epiphany/$(EPIPHANY_MAJOR)/plugins ++plugindir = $(libexecdir)/$(EPIPHANY_MAJOR)/plugins + plugin_LTLIBRARIES = libdesktopfileplugin.la + libdesktopfileplugin_la_SOURCES = \ + plugin.cpp +Index: epiphany-2.20.0/src/Makefile.am +=================================================================== +--- epiphany-2.20.0.orig/src/Makefile.am 2007-09-21 14:41:15.096978150 +0200 ++++ epiphany-2.20.0/src/Makefile.am 2007-09-21 14:44:45.784984575 +0200 +@@ -112,8 +112,8 @@ + -I$(top_srcdir)/lib/egg \ + -I$(top_srcdir)/lib/widgets \ + -I$(top_srcdir)/src/bookmarks \ +- -DEXTENSIONS_DIR=\""$(libdir)/epiphany/$(EPIPHANY_MAJOR)/extensions"\" \ +- -DLOADER_DIR=\""$(libdir)/epiphany/$(EPIPHANY_MAJOR)/loaders"\" \ ++ -DEXTENSIONS_DIR=\""$(libexecdir)/$(EPIPHANY_MAJOR)/extensions"\" \ ++ -DLOADER_DIR=\""$(libexecdir)/$(EPIPHANY_MAJOR)/loaders"\" \ + -DDATADIR=\""$(pkgdatadir)"\" \ + -DGNOMELOCALEDIR=\"$(datadir)/locale\" \ + $(AM_CPPFLAGS) +@@ -164,8 +164,8 @@ + -I$(top_builddir)/src \ + -I$(top_builddir)/src/bookmarks \ + $(PYTHON_INCLUDES) \ +- -DEXTENSIONS_DIR=\""$(libdir)/epiphany/$(EPIPHANY_MAJOR)/extensions"\" \ +- -DLOADER_DIR=\""$(libdir)/epiphany/$(EPIPHANY_MAJOR)/loaders"\" \ ++ -DEXTENSIONS_DIR=\""$(libexecdir)/$(EPIPHANY_MAJOR)/extensions"\" \ ++ -DLOADER_DIR=\""$(libexecdir)/$(EPIPHANY_MAJOR)/loaders"\" \ + -DDATADIR=\""$(datadir)"\" \ + $(AM_CPPFLAGS) + +Index: epiphany-2.20.0/src/Makefile.in +=================================================================== +--- epiphany-2.20.0.orig/src/Makefile.in 2007-09-21 14:41:15.132980201 +0200 ++++ epiphany-2.20.0/src/Makefile.in 2007-09-21 14:44:45.800985487 +0200 +@@ -521,8 +521,8 @@ + -I$(top_srcdir)/lib/egg \ + -I$(top_srcdir)/lib/widgets \ + -I$(top_srcdir)/src/bookmarks \ +- -DEXTENSIONS_DIR=\""$(libdir)/epiphany/$(EPIPHANY_MAJOR)/extensions"\" \ +- -DLOADER_DIR=\""$(libdir)/epiphany/$(EPIPHANY_MAJOR)/loaders"\" \ ++ -DEXTENSIONS_DIR=\""$(libexecdir)/$(EPIPHANY_MAJOR)/extensions"\" \ ++ -DLOADER_DIR=\""$(libexecdir)/$(EPIPHANY_MAJOR)/loaders"\" \ + -DDATADIR=\""$(pkgdatadir)"\" \ + -DGNOMELOCALEDIR=\"$(datadir)/locale\" \ + $(AM_CPPFLAGS) +@@ -560,8 +560,8 @@ + @ENABLE_PYTHON_TRUE@ -I$(top_builddir)/src \ + @ENABLE_PYTHON_TRUE@ -I$(top_builddir)/src/bookmarks \ + @ENABLE_PYTHON_TRUE@ $(PYTHON_INCLUDES) \ +-@ENABLE_PYTHON_TRUE@ -DEXTENSIONS_DIR=\""$(libdir)/epiphany/$(EPIPHANY_MAJOR)/extensions"\" \ +-@ENABLE_PYTHON_TRUE@ -DLOADER_DIR=\""$(libdir)/epiphany/$(EPIPHANY_MAJOR)/loaders"\" \ ++@ENABLE_PYTHON_TRUE@ -DEXTENSIONS_DIR=\""$(libexecdir)/$(EPIPHANY_MAJOR)/extensions"\" \ ++@ENABLE_PYTHON_TRUE@ -DLOADER_DIR=\""$(libexecdir)/$(EPIPHANY_MAJOR)/loaders"\" \ + @ENABLE_PYTHON_TRUE@ -DDATADIR=\""$(datadir)"\" \ + @ENABLE_PYTHON_TRUE@ $(AM_CPPFLAGS) + --- epiphany-browser-2.21.90.orig/debian/patches/07_bookmarks.patch +++ epiphany-browser-2.21.90/debian/patches/07_bookmarks.patch @@ -0,0 +1,15 @@ +Index: epiphany-browser-2.18.0/src/bookmarks/ephy-bookmarks.c +=================================================================== +--- epiphany-browser-2.18.0.orig/src/bookmarks/ephy-bookmarks.c 2007-03-06 12:31:26.000000000 +0000 ++++ epiphany-browser-2.18.0/src/bookmarks/ephy-bookmarks.c 2007-03-11 21:01:42.000000000 +0000 +@@ -102,6 +102,10 @@ + * For instance in .nl these should be + * "http://www.google.nl" and "http://www.google.nl/search?q=%s" + */ ++ { N_("Debian"), N_("http://www.debian.org/") }, ++ { N_("GNOME"), N_("http://www.gnome.org/") }, ++ { N_("Planet Debian"), N_("http://planet.debian.org/") }, ++ { N_("Debian Bug Tracking System"), N_("http://bugs.debian.org/%s") }, + { N_("Search the web"), N_("http://www.google.com/search?q=%s&ie=UTF-8&oe=UTF-8") } + }; + --- epiphany-browser-2.21.90.orig/debian/patches/08_load_on_new_tab.patch +++ epiphany-browser-2.21.90/debian/patches/08_load_on_new_tab.patch @@ -0,0 +1,90 @@ +Index: epiphany-browser-2.18.0/data/epiphany.schemas.in +=================================================================== +--- epiphany-browser-2.18.0.orig/data/epiphany.schemas.in 2007-03-06 12:31:58.000000000 +0000 ++++ epiphany-browser-2.18.0/data/epiphany.schemas.in 2007-03-11 21:01:46.000000000 +0000 +@@ -168,6 +168,21 @@ + + + ++ /schemas/apps/epiphany/general/load_on_new_tab ++ /apps/epiphany/general/load_on_new_tab ++ epiphany ++ int ++ 1 ++ ++ Page to open when opening a new tab ++ Page to open when opening a new tab. Allowed values are -1 ++ (browser startup page), 0 (blank page), 1 (homepage), 2 (last visited ++ page), as defined for mozilla's browser.tab.loadOnNewTab about:config ++ option. Both -1 and 1 are implemented the same way; 2 is not ++ implemented. ++ ++ ++ + /schemas/apps/epiphany/general/show_bookmarks_bar + /apps/epiphany/general/show_bookmarks_bar + epiphany +Index: epiphany-browser-2.18.0/lib/ephy-prefs.h +=================================================================== +--- epiphany-browser-2.18.0.orig/lib/ephy-prefs.h 2007-03-06 12:31:55.000000000 +0000 ++++ epiphany-browser-2.18.0/lib/ephy-prefs.h 2007-03-11 21:01:46.000000000 +0000 +@@ -37,6 +37,7 @@ + #define CONF_AUTO_DOWNLOADS "/apps/epiphany/general/automatic_downloads" + #define CONF_DESKTOP_IS_HOME_DIR "/apps/nautilus/preferences/desktop_is_home_dir" + #define CONF_NETWORK_MANAGED "/apps/epiphany/general/managed_network" ++#define CONF_BROWSER_TABS_LOADONNEWTAB "/apps/epiphany/general/load_on_new_tab" + + /* i18n pref */ + #define CONF_GECKO_ENABLE_PANGO "/apps/epiphany/web/enable_pango" +Index: epiphany-browser-2.18.0/src/ephy-shell.c +=================================================================== +--- epiphany-browser-2.18.0.orig/src/ephy-shell.c 2007-03-06 12:31:28.000000000 +0000 ++++ epiphany-browser-2.18.0/src/ephy-shell.c 2007-03-11 21:01:46.000000000 +0000 +@@ -530,14 +530,45 @@ + gtk_window_fullscreen (GTK_WINDOW (window)); + } + +- if (flags & EPHY_NEW_TAB_HOME_PAGE || +- flags & EPHY_NEW_TAB_NEW_PAGE) ++ if (flags & EPHY_NEW_TAB_HOME_PAGE) + { + ephy_tab_set_typed_address (tab, "", + EPHY_TAB_ADDRESS_EXPIRE_NEXT); + ephy_toolbar_activate_location (toolbar); + is_empty = load_homepage (embed); + } ++ else if (flags & EPHY_NEW_TAB_NEW_PAGE) ++ { ++ /* Simulate mozilla's browser.tabs.loadOnNewTab option through ++ * a gconf option. ++ * ++ * Documentation at: http://kb.mozillazine.org/About:config_entries ++ * ++ * To ensure that no blank page is displayed by default, this key ++ * is set to 1 by default in the schema (see data/epiphany.schema.in) ++ */ ++ int load_on_new_tab = eel_gconf_get_integer (CONF_BROWSER_TABS_LOADONNEWTAB); ++ ++ switch (load_on_new_tab) ++ { ++ case 0: /* Blank page */ ++ ephy_embed_load_url (embed, "about:blank"); ++ is_empty = url_is_empty ("about:blank"); ++ break; ++ ++ case 2: /* Last visited */ ++ /* NOT IMPLEMENTED */ ++ ++ case -1: /* Start-up page */ ++ case 1: /* Homepage */ ++ default: ++ /* Same as in the previous 'if' test */ ++ ephy_tab_set_typed_address (tab, "", ++ EPHY_TAB_ADDRESS_EXPIRE_NEXT); ++ ephy_toolbar_activate_location (toolbar); ++ is_empty = load_homepage (embed); ++ } ++ } + else if (flags & EPHY_NEW_TAB_OPEN_PAGE) + { + EphyEmbedLoadFlags load_flags = 0; --- epiphany-browser-2.21.90.orig/debian/patches/99_autoreconf.patch +++ epiphany-browser-2.21.90/debian/patches/99_autoreconf.patch @@ -0,0 +1,4611 @@ +--- + aclocal.m4 | 2 + config.h.in | 3 + configure | 1002 ++++++++++++++++++++++++++++++++------- + doc/reference/Makefile.in | 7 + embed/Makefile.in | 4 + embed/mozilla/Makefile.in | 30 - + gtk-doc.make | 174 ++++++ + plugins/desktop-file/Makefile.in | 8 + src/Makefile.in | 91 ++- + 9 files changed, 1113 insertions(+), 208 deletions(-) + +Index: epiphany-browser-2.21.90/aclocal.m4 +=================================================================== +--- epiphany-browser-2.21.90.orig/aclocal.m4 ++++ epiphany-browser-2.21.90/aclocal.m4 +@@ -677,17 +677,17 @@ + AC_MSG_RESULT($complCXXFLAGS) + + WARN_CXXFLAGS="$CXXFLAGS $warnCXXFLAGS $complCXXFLAGS" + AC_SUBST(WARN_CXXFLAGS) + ]) + + # libtool.m4 - Configure libtool for the host system. -*-Autoconf-*- + +-# serial 51 Debian 1.5.24-1ubuntu1 AC_PROG_LIBTOOL ++# serial 51 Debian 1.5.24-2ubuntu2 AC_PROG_LIBTOOL + + + # AC_PROVIDE_IFELSE(MACRO-NAME, IF-PROVIDED, IF-NOT-PROVIDED) + # ----------------------------------------------------------- + # If this macro is not defined by Autoconf, define it here. + m4_ifdef([AC_PROVIDE_IFELSE], + [], + [m4_define([AC_PROVIDE_IFELSE], +Index: epiphany-browser-2.21.90/config.h.in +=================================================================== +--- epiphany-browser-2.21.90.orig/config.h.in ++++ epiphany-browser-2.21.90/config.h.in +@@ -49,16 +49,19 @@ + #undef HAVE_GECKO_1_8_1 + + /* Define if we have gecko 1.9 */ + #undef HAVE_GECKO_1_9 + + /* Define if gecko is a debug build */ + #undef HAVE_GECKO_DEBUG + ++/* Define if xpcom glue is used */ ++#undef HAVE_GECKO_XPCOM_GLUE ++ + /* Define if the GNU gettext() function is already present or preinstalled. */ + #undef HAVE_GETTEXT + + /* Define to 1 if you have the header file. */ + #undef HAVE_INTTYPES_H + + /* Define if you have the iso-codes package */ + #undef HAVE_ISO_CODES +Index: epiphany-browser-2.21.90/configure +=================================================================== +--- epiphany-browser-2.21.90.orig/configure ++++ epiphany-browser-2.21.90/configure +@@ -722,17 +722,17 @@ + cross_compiling=no + subdirs= + MFLAGS= + MAKEFLAGS= + SHELL=${CONFIG_SHELL-/bin/sh} + + # Identity of this package. + PACKAGE_NAME='GNOME Web Browser' +-PACKAGE_TARNAME='epiphany' ++PACKAGE_TARNAME='epiphany-browser' + PACKAGE_VERSION='2.21.90' + PACKAGE_STRING='GNOME Web Browser 2.21.90' + PACKAGE_BUGREPORT='http://bugzilla.gnome.org/enter_bug.cgi?product=epiphany' + + ac_unique_file="configure.ac" + # Factoring default headers for most tests. + ac_includes_default="\ + #include +@@ -895,16 +895,19 @@ + INTLTOOL_KBD_RULE + INTLTOOL_XML_RULE + INTLTOOL_XML_NOMERGE_RULE + INTLTOOL_CAVES_RULE + INTLTOOL_SCHEMAS_RULE + INTLTOOL_THEME_RULE + INTLTOOL_SERVICE_RULE + INTLTOOL_POLICY_RULE ++XGETTEXT ++MSGMERGE ++MSGFMT + INTLTOOL_EXTRACT + INTLTOOL_MERGE + INTLTOOL_UPDATE + INTLTOOL_PERL + ALL_LINGUAS + DATADIRNAME + PKG_CONFIG + WARN_CFLAGS +@@ -916,38 +919,42 @@ + DBUS_LIBS + DBUS_BINDING_TOOL + GCONF_SCHEMA_CONFIG_SOURCE + GCONF_SCHEMA_FILE_DIR + GCONF_SCHEMAS_INSTALL_TRUE + GCONF_SCHEMAS_INSTALL_FALSE + GCONFTOOL + with_engine ++HAVE_GECKO_DEBUG_TRUE ++HAVE_GECKO_DEBUG_FALSE ++HAVE_GECKO_XPCOM_GLUE_TRUE ++HAVE_GECKO_XPCOM_GLUE_FALSE + GECKO + GECKO_FLAVOUR + GECKO_INCLUDE_ROOT + GECKO_HOME + GECKO_PREFIX + GECKO_EXTRA_LIBS + GECKO_GLUE_LIBS + GECKO_CFLAGS + GECKO_LIBS + WEASEL_UA_VERSION + HAVE_MOZILLA_TOOLKIT_TRUE + HAVE_MOZILLA_TOOLKIT_FALSE +-HAVE_GECKO_DEBUG_TRUE +-HAVE_GECKO_DEBUG_FALSE + HAVE_GECKO_1_7_TRUE + HAVE_GECKO_1_7_FALSE + HAVE_GECKO_1_8_TRUE + HAVE_GECKO_1_8_FALSE + HAVE_GECKO_1_8_1_TRUE + HAVE_GECKO_1_8_1_FALSE + HAVE_GECKO_1_9_TRUE + HAVE_GECKO_1_9_FALSE ++HAVE_GECKO_HOME_TRUE ++HAVE_GECKO_HOME_FALSE + WITH_GECKO_ENGINE_TRUE + WITH_GECKO_ENGINE_FALSE + HAVE_XULRUNNER_TRUE + HAVE_XULRUNNER_FALSE + HAVE_MOZILLA_PSM_TRUE + HAVE_MOZILLA_PSM_FALSE + ENABLE_FILEPICKER_TRUE + ENABLE_FILEPICKER_FALSE +@@ -1010,39 +1017,37 @@ + ENABLE_SPELLCHECKER_TRUE + ENABLE_SPELLCHECKER_FALSE + AM_CPPFLAGS + AM_CFLAGS + AM_CXXFLAGS + AM_LDFLAGS + GETTEXT_PACKAGE + USE_NLS +-MSGFMT + MSGFMT_OPTS + GMSGFMT +-XGETTEXT + CATALOGS + CATOBJEXT + GMOFILES + INSTOBJEXT + INTLLIBS + PO_IN_DATADIR_TRUE + PO_IN_DATADIR_FALSE + POFILES + POSUB + MKINSTALLDIRS + HELP_DIR + OMF_DIR + DOC_USER_FORMATS + ENABLE_SK_TRUE + ENABLE_SK_FALSE +-DISTCHECK_CONFIGURE_FLAGS + HAVE_GNOME_DOC_UTILS_TRUE + HAVE_GNOME_DOC_UTILS_FALSE + HTML_DIR ++GTKDOC_CHECK + ENABLE_GTK_DOC_TRUE + ENABLE_GTK_DOC_FALSE + GTK_DOC_USE_LIBTOOL_TRUE + GTK_DOC_USE_LIBTOOL_FALSE + SVN_ROOT + SVN_MODULE + SVN_BRANCH + GTK_CFLAGS +@@ -1648,17 +1653,17 @@ + --libdir=DIR object code libraries [EPREFIX/lib] + --includedir=DIR C header files [PREFIX/include] + --oldincludedir=DIR C header files for non-gcc [/usr/include] + --datarootdir=DIR read-only arch.-independent data root [PREFIX/share] + --datadir=DIR read-only architecture-independent data [DATAROOTDIR] + --infodir=DIR info documentation [DATAROOTDIR/info] + --localedir=DIR locale-dependent data [DATAROOTDIR/locale] + --mandir=DIR man documentation [DATAROOTDIR/man] +- --docdir=DIR documentation root [DATAROOTDIR/doc/epiphany] ++ --docdir=DIR documentation root [DATAROOTDIR/doc/epiphany-browser] + --htmldir=DIR html documentation [DOCDIR] + --dvidir=DIR dvi documentation [DOCDIR] + --pdfdir=DIR pdf documentation [DOCDIR] + --psdir=DIR ps documentation [DOCDIR] + _ACEOF + + cat <<\_ACEOF + +@@ -1726,19 +1731,21 @@ + --with-gnu-ld assume the C compiler uses GNU ld [default=no] + --with-pic try to use only PIC/non-PIC objects [default=use + both] + --with-tags[=TAGS] include additional configurations [automatic] + --with-gconf-source=sourceaddress Config database for installing schema files. + --with-gconf-schema-file-dir=dir Directory for installing schema files. + --with-engine[=mozilla|webkit|xulrunner] + Which engine to build against [mozilla] +- --with-gecko[=mozilla|firefox|seamonkey|xulrunner] ++ --with-gecko[=mozilla|firefox|seamonkey|xulrunner|libxul-embedding|libxul] + Which gecko engine to use (autodetected by default) + ++ --with-gecko-home[=path] ++ Manually set MOZILLA_FIVE_HOME + --with-help-dir=DIR path to help docs + --with-omf-dir=DIR path to OMF files + --with-help-formats=FORMATS + list of formats + --with-html-dir=PATH path to installed docs + --with-distributor-name=name Distributor name. + + Some influential environment variables: +@@ -2595,17 +2602,17 @@ + CYGPATH_W='cygpath -w' + else + CYGPATH_W=echo + fi + fi + + + # Define the identity of the package. +- PACKAGE='epiphany' ++ PACKAGE='epiphany-browser' + VERSION='2.21.90' + + + cat >>confdefs.h <<_ACEOF + #define PACKAGE "$PACKAGE" + _ACEOF + + +@@ -4747,17 +4754,17 @@ + HPUX_IA64_MODE="64" + ;; + esac + fi + rm -rf conftest* + ;; + *-*-irix6*) + # Find out which ABI we are using. +- echo '#line 4755 "configure"' > conftest.$ac_ext ++ echo '#line 4762 "configure"' > conftest.$ac_ext + if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; then + if test "$lt_cv_prog_gnu_ld" = yes; then + case `/usr/bin/file conftest.$ac_objext` in + *32-bit*) +@@ -7489,21 +7496,21 @@ + # (2) before a word containing "conftest.", or (3) at the end. + # Note that $ac_compile itself does not contain backslashes and begins + # with a dollar sign (not a hyphen), so the echo should work correctly. + # The option is referenced via a variable to avoid confusing sed. + lt_compile=`echo "$ac_compile" | $SED \ + -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ + -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ + -e 's:$: $lt_compiler_flag:'` +- (eval echo "\"\$as_me:7497: $lt_compile\"" >&5) ++ (eval echo "\"\$as_me:7504: $lt_compile\"" >&5) + (eval "$lt_compile" 2>conftest.err) + ac_status=$? + cat conftest.err >&5 +- echo "$as_me:7501: \$? = $ac_status" >&5 ++ echo "$as_me:7508: \$? = $ac_status" >&5 + if (exit $ac_status) && test -s "$ac_outfile"; then + # The compiler can only warn and ignore the option if not recognized + # So say no if there are warnings other than the usual output. + $echo "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' >conftest.exp + $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2 + if test ! -s conftest.er2 || diff conftest.exp conftest.er2 >/dev/null; then + lt_cv_prog_compiler_rtti_exceptions=yes + fi +@@ -7779,21 +7786,21 @@ + # (2) before a word containing "conftest.", or (3) at the end. + # Note that $ac_compile itself does not contain backslashes and begins + # with a dollar sign (not a hyphen), so the echo should work correctly. + # The option is referenced via a variable to avoid confusing sed. + lt_compile=`echo "$ac_compile" | $SED \ + -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ + -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ + -e 's:$: $lt_compiler_flag:'` +- (eval echo "\"\$as_me:7787: $lt_compile\"" >&5) ++ (eval echo "\"\$as_me:7794: $lt_compile\"" >&5) + (eval "$lt_compile" 2>conftest.err) + ac_status=$? + cat conftest.err >&5 +- echo "$as_me:7791: \$? = $ac_status" >&5 ++ echo "$as_me:7798: \$? = $ac_status" >&5 + if (exit $ac_status) && test -s "$ac_outfile"; then + # The compiler can only warn and ignore the option if not recognized + # So say no if there are warnings other than the usual output. + $echo "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' >conftest.exp + $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2 + if test ! -s conftest.er2 || diff conftest.exp conftest.er2 >/dev/null; then + lt_prog_compiler_pic_works=yes + fi +@@ -7883,21 +7890,21 @@ + # Insert the option either (1) after the last *FLAGS variable, or + # (2) before a word containing "conftest.", or (3) at the end. + # Note that $ac_compile itself does not contain backslashes and begins + # with a dollar sign (not a hyphen), so the echo should work correctly. + lt_compile=`echo "$ac_compile" | $SED \ + -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ + -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ + -e 's:$: $lt_compiler_flag:'` +- (eval echo "\"\$as_me:7891: $lt_compile\"" >&5) ++ (eval echo "\"\$as_me:7898: $lt_compile\"" >&5) + (eval "$lt_compile" 2>out/conftest.err) + ac_status=$? + cat out/conftest.err >&5 +- echo "$as_me:7895: \$? = $ac_status" >&5 ++ echo "$as_me:7902: \$? = $ac_status" >&5 + if (exit $ac_status) && test -s out/conftest2.$ac_objext + then + # The compiler can only warn and ignore the option if not recognized + # So say no if there are warnings + $echo "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' > out/conftest.exp + $SED '/^$/d; /^ *+/d' out/conftest.err >out/conftest.er2 + if test ! -s out/conftest.er2 || diff out/conftest.exp out/conftest.er2 >/dev/null; then + lt_cv_prog_compiler_c_o=yes +@@ -10245,17 +10252,17 @@ + echo $ECHO_N "(cached) $ECHO_C" >&6 + else + if test "$cross_compiling" = yes; then : + lt_cv_dlopen_self=cross + else + lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 + lt_status=$lt_dlunknown + cat > conftest.$ac_ext < + #endif + + #include + +@@ -10345,17 +10352,17 @@ + echo $ECHO_N "(cached) $ECHO_C" >&6 + else + if test "$cross_compiling" = yes; then : + lt_cv_dlopen_self_static=cross + else + lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 + lt_status=$lt_dlunknown + cat > conftest.$ac_ext < + #endif + + #include + +@@ -12765,21 +12772,21 @@ + # (2) before a word containing "conftest.", or (3) at the end. + # Note that $ac_compile itself does not contain backslashes and begins + # with a dollar sign (not a hyphen), so the echo should work correctly. + # The option is referenced via a variable to avoid confusing sed. + lt_compile=`echo "$ac_compile" | $SED \ + -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ + -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ + -e 's:$: $lt_compiler_flag:'` +- (eval echo "\"\$as_me:12773: $lt_compile\"" >&5) ++ (eval echo "\"\$as_me:12780: $lt_compile\"" >&5) + (eval "$lt_compile" 2>conftest.err) + ac_status=$? + cat conftest.err >&5 +- echo "$as_me:12777: \$? = $ac_status" >&5 ++ echo "$as_me:12784: \$? = $ac_status" >&5 + if (exit $ac_status) && test -s "$ac_outfile"; then + # The compiler can only warn and ignore the option if not recognized + # So say no if there are warnings other than the usual output. + $echo "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' >conftest.exp + $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2 + if test ! -s conftest.er2 || diff conftest.exp conftest.er2 >/dev/null; then + lt_prog_compiler_pic_works_CXX=yes + fi +@@ -12869,21 +12876,21 @@ + # Insert the option either (1) after the last *FLAGS variable, or + # (2) before a word containing "conftest.", or (3) at the end. + # Note that $ac_compile itself does not contain backslashes and begins + # with a dollar sign (not a hyphen), so the echo should work correctly. + lt_compile=`echo "$ac_compile" | $SED \ + -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ + -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ + -e 's:$: $lt_compiler_flag:'` +- (eval echo "\"\$as_me:12877: $lt_compile\"" >&5) ++ (eval echo "\"\$as_me:12884: $lt_compile\"" >&5) + (eval "$lt_compile" 2>out/conftest.err) + ac_status=$? + cat out/conftest.err >&5 +- echo "$as_me:12881: \$? = $ac_status" >&5 ++ echo "$as_me:12888: \$? = $ac_status" >&5 + if (exit $ac_status) && test -s out/conftest2.$ac_objext + then + # The compiler can only warn and ignore the option if not recognized + # So say no if there are warnings + $echo "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' > out/conftest.exp + $SED '/^$/d; /^ *+/d' out/conftest.err >out/conftest.er2 + if test ! -s out/conftest.er2 || diff out/conftest.exp out/conftest.er2 >/dev/null; then + lt_cv_prog_compiler_c_o_CXX=yes +@@ -14446,21 +14453,21 @@ + # (2) before a word containing "conftest.", or (3) at the end. + # Note that $ac_compile itself does not contain backslashes and begins + # with a dollar sign (not a hyphen), so the echo should work correctly. + # The option is referenced via a variable to avoid confusing sed. + lt_compile=`echo "$ac_compile" | $SED \ + -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ + -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ + -e 's:$: $lt_compiler_flag:'` +- (eval echo "\"\$as_me:14454: $lt_compile\"" >&5) ++ (eval echo "\"\$as_me:14461: $lt_compile\"" >&5) + (eval "$lt_compile" 2>conftest.err) + ac_status=$? + cat conftest.err >&5 +- echo "$as_me:14458: \$? = $ac_status" >&5 ++ echo "$as_me:14465: \$? = $ac_status" >&5 + if (exit $ac_status) && test -s "$ac_outfile"; then + # The compiler can only warn and ignore the option if not recognized + # So say no if there are warnings other than the usual output. + $echo "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' >conftest.exp + $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2 + if test ! -s conftest.er2 || diff conftest.exp conftest.er2 >/dev/null; then + lt_prog_compiler_pic_works_F77=yes + fi +@@ -14550,21 +14557,21 @@ + # Insert the option either (1) after the last *FLAGS variable, or + # (2) before a word containing "conftest.", or (3) at the end. + # Note that $ac_compile itself does not contain backslashes and begins + # with a dollar sign (not a hyphen), so the echo should work correctly. + lt_compile=`echo "$ac_compile" | $SED \ + -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ + -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ + -e 's:$: $lt_compiler_flag:'` +- (eval echo "\"\$as_me:14558: $lt_compile\"" >&5) ++ (eval echo "\"\$as_me:14565: $lt_compile\"" >&5) + (eval "$lt_compile" 2>out/conftest.err) + ac_status=$? + cat out/conftest.err >&5 +- echo "$as_me:14562: \$? = $ac_status" >&5 ++ echo "$as_me:14569: \$? = $ac_status" >&5 + if (exit $ac_status) && test -s out/conftest2.$ac_objext + then + # The compiler can only warn and ignore the option if not recognized + # So say no if there are warnings + $echo "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' > out/conftest.exp + $SED '/^$/d; /^ *+/d' out/conftest.err >out/conftest.er2 + if test ! -s out/conftest.er2 || diff out/conftest.exp out/conftest.er2 >/dev/null; then + lt_cv_prog_compiler_c_o_F77=yes +@@ -16750,21 +16757,21 @@ + # (2) before a word containing "conftest.", or (3) at the end. + # Note that $ac_compile itself does not contain backslashes and begins + # with a dollar sign (not a hyphen), so the echo should work correctly. + # The option is referenced via a variable to avoid confusing sed. + lt_compile=`echo "$ac_compile" | $SED \ + -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ + -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ + -e 's:$: $lt_compiler_flag:'` +- (eval echo "\"\$as_me:16758: $lt_compile\"" >&5) ++ (eval echo "\"\$as_me:16765: $lt_compile\"" >&5) + (eval "$lt_compile" 2>conftest.err) + ac_status=$? + cat conftest.err >&5 +- echo "$as_me:16762: \$? = $ac_status" >&5 ++ echo "$as_me:16769: \$? = $ac_status" >&5 + if (exit $ac_status) && test -s "$ac_outfile"; then + # The compiler can only warn and ignore the option if not recognized + # So say no if there are warnings other than the usual output. + $echo "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' >conftest.exp + $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2 + if test ! -s conftest.er2 || diff conftest.exp conftest.er2 >/dev/null; then + lt_cv_prog_compiler_rtti_exceptions=yes + fi +@@ -17040,21 +17047,21 @@ + # (2) before a word containing "conftest.", or (3) at the end. + # Note that $ac_compile itself does not contain backslashes and begins + # with a dollar sign (not a hyphen), so the echo should work correctly. + # The option is referenced via a variable to avoid confusing sed. + lt_compile=`echo "$ac_compile" | $SED \ + -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ + -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ + -e 's:$: $lt_compiler_flag:'` +- (eval echo "\"\$as_me:17048: $lt_compile\"" >&5) ++ (eval echo "\"\$as_me:17055: $lt_compile\"" >&5) + (eval "$lt_compile" 2>conftest.err) + ac_status=$? + cat conftest.err >&5 +- echo "$as_me:17052: \$? = $ac_status" >&5 ++ echo "$as_me:17059: \$? = $ac_status" >&5 + if (exit $ac_status) && test -s "$ac_outfile"; then + # The compiler can only warn and ignore the option if not recognized + # So say no if there are warnings other than the usual output. + $echo "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' >conftest.exp + $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2 + if test ! -s conftest.er2 || diff conftest.exp conftest.er2 >/dev/null; then + lt_prog_compiler_pic_works_GCJ=yes + fi +@@ -17144,21 +17151,21 @@ + # Insert the option either (1) after the last *FLAGS variable, or + # (2) before a word containing "conftest.", or (3) at the end. + # Note that $ac_compile itself does not contain backslashes and begins + # with a dollar sign (not a hyphen), so the echo should work correctly. + lt_compile=`echo "$ac_compile" | $SED \ + -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ + -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ + -e 's:$: $lt_compiler_flag:'` +- (eval echo "\"\$as_me:17152: $lt_compile\"" >&5) ++ (eval echo "\"\$as_me:17159: $lt_compile\"" >&5) + (eval "$lt_compile" 2>out/conftest.err) + ac_status=$? + cat out/conftest.err >&5 +- echo "$as_me:17156: \$? = $ac_status" >&5 ++ echo "$as_me:17163: \$? = $ac_status" >&5 + if (exit $ac_status) && test -s out/conftest2.$ac_objext + then + # The compiler can only warn and ignore the option if not recognized + # So say no if there are warnings + $echo "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' > out/conftest.exp + $SED '/^$/d; /^ *+/d' out/conftest.err >out/conftest.er2 + if test ! -s out/conftest.er2 || diff out/conftest.exp out/conftest.er2 >/dev/null; then + lt_cv_prog_compiler_c_o_GCJ=yes +@@ -22319,16 +22326,151 @@ + + + + + + + + ++# Check the gettext tools to make sure they are GNU ++# Extract the first word of "xgettext", so it can be a program name with args. ++set dummy xgettext; ac_word=$2 ++{ echo "$as_me:$LINENO: checking for $ac_word" >&5 ++echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } ++if test "${ac_cv_path_XGETTEXT+set}" = set; then ++ echo $ECHO_N "(cached) $ECHO_C" >&6 ++else ++ case $XGETTEXT in ++ [\\/]* | ?:[\\/]*) ++ ac_cv_path_XGETTEXT="$XGETTEXT" # Let the user override the test with a path. ++ ;; ++ *) ++ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR ++for as_dir in $PATH ++do ++ IFS=$as_save_IFS ++ test -z "$as_dir" && as_dir=. ++ for ac_exec_ext in '' $ac_executable_extensions; do ++ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ++ ac_cv_path_XGETTEXT="$as_dir/$ac_word$ac_exec_ext" ++ echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 ++ break 2 ++ fi ++done ++done ++IFS=$as_save_IFS ++ ++ ;; ++esac ++fi ++XGETTEXT=$ac_cv_path_XGETTEXT ++if test -n "$XGETTEXT"; then ++ { echo "$as_me:$LINENO: result: $XGETTEXT" >&5 ++echo "${ECHO_T}$XGETTEXT" >&6; } ++else ++ { echo "$as_me:$LINENO: result: no" >&5 ++echo "${ECHO_T}no" >&6; } ++fi ++ ++ ++# Extract the first word of "msgmerge", so it can be a program name with args. ++set dummy msgmerge; ac_word=$2 ++{ echo "$as_me:$LINENO: checking for $ac_word" >&5 ++echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } ++if test "${ac_cv_path_MSGMERGE+set}" = set; then ++ echo $ECHO_N "(cached) $ECHO_C" >&6 ++else ++ case $MSGMERGE in ++ [\\/]* | ?:[\\/]*) ++ ac_cv_path_MSGMERGE="$MSGMERGE" # Let the user override the test with a path. ++ ;; ++ *) ++ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR ++for as_dir in $PATH ++do ++ IFS=$as_save_IFS ++ test -z "$as_dir" && as_dir=. ++ for ac_exec_ext in '' $ac_executable_extensions; do ++ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ++ ac_cv_path_MSGMERGE="$as_dir/$ac_word$ac_exec_ext" ++ echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 ++ break 2 ++ fi ++done ++done ++IFS=$as_save_IFS ++ ++ ;; ++esac ++fi ++MSGMERGE=$ac_cv_path_MSGMERGE ++if test -n "$MSGMERGE"; then ++ { echo "$as_me:$LINENO: result: $MSGMERGE" >&5 ++echo "${ECHO_T}$MSGMERGE" >&6; } ++else ++ { echo "$as_me:$LINENO: result: no" >&5 ++echo "${ECHO_T}no" >&6; } ++fi ++ ++ ++# Extract the first word of "msgfmt", so it can be a program name with args. ++set dummy msgfmt; ac_word=$2 ++{ echo "$as_me:$LINENO: checking for $ac_word" >&5 ++echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } ++if test "${ac_cv_path_MSGFMT+set}" = set; then ++ echo $ECHO_N "(cached) $ECHO_C" >&6 ++else ++ case $MSGFMT in ++ [\\/]* | ?:[\\/]*) ++ ac_cv_path_MSGFMT="$MSGFMT" # Let the user override the test with a path. ++ ;; ++ *) ++ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR ++for as_dir in $PATH ++do ++ IFS=$as_save_IFS ++ test -z "$as_dir" && as_dir=. ++ for ac_exec_ext in '' $ac_executable_extensions; do ++ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ++ ac_cv_path_MSGFMT="$as_dir/$ac_word$ac_exec_ext" ++ echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 ++ break 2 ++ fi ++done ++done ++IFS=$as_save_IFS ++ ++ ;; ++esac ++fi ++MSGFMT=$ac_cv_path_MSGFMT ++if test -n "$MSGFMT"; then ++ { echo "$as_me:$LINENO: result: $MSGFMT" >&5 ++echo "${ECHO_T}$MSGFMT" >&6; } ++else ++ { echo "$as_me:$LINENO: result: no" >&5 ++echo "${ECHO_T}no" >&6; } ++fi ++ ++ ++if test -z "$XGETTEXT" -o -z "$MSGMERGE" -o -z "$MSGFMT"; then ++ { { echo "$as_me:$LINENO: error: GNU gettext tools not found; required for intltool" >&5 ++echo "$as_me: error: GNU gettext tools not found; required for intltool" >&2;} ++ { (exit 1); exit 1; }; } ++fi ++xgversion="`$XGETTEXT --version|grep '(GNU ' 2> /dev/null`" ++mmversion="`$MSGMERGE --version|grep '(GNU ' 2> /dev/null`" ++mfversion="`$MSGFMT --version|grep '(GNU ' 2> /dev/null`" ++if test -z "$xgversion" -o -z "$mmversion" -o -z "$mfversion"; then ++ { { echo "$as_me:$LINENO: error: GNU gettext tools not found; required for intltool" >&5 ++echo "$as_me: error: GNU gettext tools not found; required for intltool" >&2;} ++ { (exit 1); exit 1; }; } ++fi ++ + # Use the tools built into the package, not the ones that are installed. + INTLTOOL_EXTRACT='$(top_builddir)/intltool-extract' + + INTLTOOL_MERGE='$(top_builddir)/intltool-merge' + + INTLTOOL_UPDATE='$(top_builddir)/intltool-update' + + +@@ -22955,32 +23097,34 @@ + gmodule-2.0 + gio-unix-2.0 >= \$GLIB_REQUIRED + gtk+-2.0 >= \$GTK_REQUIRED + gtk+-unix-print-2.0 >= \$GTK_REQUIRED + libxml-2.0 >= \$LIBXML_REQUIRED + libxslt >= \$LIBXSLT_REQUIRED + libgnome-2.0 >= \$LIBGNOME_REQUIRED + libgnomeui-2.0 >= \$LIBGNOMEUI_REQUIRED ++ launchpad-integration + libglade-2.0 >= \$LIBGLADE_REQUIRED \\ + gconf-2.0 + gnome-desktop-2.0 >= \$GNOME_DESKTOP_REQUIRED + libstartup-notification-1.0 >= \$LIBSTARTUP_NOTIFICATION_REQUIRED + \$LIBNOTIFY_PACKAGE + \"") >&5 + ($PKG_CONFIG --exists --print-errors " + glib-2.0 >= $GLIB_REQUIRED + gmodule-2.0 + gio-unix-2.0 >= $GLIB_REQUIRED + gtk+-2.0 >= $GTK_REQUIRED + gtk+-unix-print-2.0 >= $GTK_REQUIRED + libxml-2.0 >= $LIBXML_REQUIRED + libxslt >= $LIBXSLT_REQUIRED + libgnome-2.0 >= $LIBGNOME_REQUIRED + libgnomeui-2.0 >= $LIBGNOMEUI_REQUIRED ++ launchpad-integration + libglade-2.0 >= $LIBGLADE_REQUIRED \ + gconf-2.0 + gnome-desktop-2.0 >= $GNOME_DESKTOP_REQUIRED + libstartup-notification-1.0 >= $LIBSTARTUP_NOTIFICATION_REQUIRED + $LIBNOTIFY_PACKAGE + ") 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 +@@ -22990,16 +23134,17 @@ + gmodule-2.0 + gio-unix-2.0 >= $GLIB_REQUIRED + gtk+-2.0 >= $GTK_REQUIRED + gtk+-unix-print-2.0 >= $GTK_REQUIRED + libxml-2.0 >= $LIBXML_REQUIRED + libxslt >= $LIBXSLT_REQUIRED + libgnome-2.0 >= $LIBGNOME_REQUIRED + libgnomeui-2.0 >= $LIBGNOMEUI_REQUIRED ++ launchpad-integration + libglade-2.0 >= $LIBGLADE_REQUIRED \ + gconf-2.0 + gnome-desktop-2.0 >= $GNOME_DESKTOP_REQUIRED + libstartup-notification-1.0 >= $LIBSTARTUP_NOTIFICATION_REQUIRED + $LIBNOTIFY_PACKAGE + " 2>/dev/null` + else + pkg_failed=yes +@@ -23018,32 +23163,34 @@ + gmodule-2.0 + gio-unix-2.0 >= \$GLIB_REQUIRED + gtk+-2.0 >= \$GTK_REQUIRED + gtk+-unix-print-2.0 >= \$GTK_REQUIRED + libxml-2.0 >= \$LIBXML_REQUIRED + libxslt >= \$LIBXSLT_REQUIRED + libgnome-2.0 >= \$LIBGNOME_REQUIRED + libgnomeui-2.0 >= \$LIBGNOMEUI_REQUIRED ++ launchpad-integration + libglade-2.0 >= \$LIBGLADE_REQUIRED \\ + gconf-2.0 + gnome-desktop-2.0 >= \$GNOME_DESKTOP_REQUIRED + libstartup-notification-1.0 >= \$LIBSTARTUP_NOTIFICATION_REQUIRED + \$LIBNOTIFY_PACKAGE + \"") >&5 + ($PKG_CONFIG --exists --print-errors " + glib-2.0 >= $GLIB_REQUIRED + gmodule-2.0 + gio-unix-2.0 >= $GLIB_REQUIRED + gtk+-2.0 >= $GTK_REQUIRED + gtk+-unix-print-2.0 >= $GTK_REQUIRED + libxml-2.0 >= $LIBXML_REQUIRED + libxslt >= $LIBXSLT_REQUIRED + libgnome-2.0 >= $LIBGNOME_REQUIRED + libgnomeui-2.0 >= $LIBGNOMEUI_REQUIRED ++ launchpad-integration + libglade-2.0 >= $LIBGLADE_REQUIRED \ + gconf-2.0 + gnome-desktop-2.0 >= $GNOME_DESKTOP_REQUIRED + libstartup-notification-1.0 >= $LIBSTARTUP_NOTIFICATION_REQUIRED + $LIBNOTIFY_PACKAGE + ") 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 +@@ -23053,16 +23200,17 @@ + gmodule-2.0 + gio-unix-2.0 >= $GLIB_REQUIRED + gtk+-2.0 >= $GTK_REQUIRED + gtk+-unix-print-2.0 >= $GTK_REQUIRED + libxml-2.0 >= $LIBXML_REQUIRED + libxslt >= $LIBXSLT_REQUIRED + libgnome-2.0 >= $LIBGNOME_REQUIRED + libgnomeui-2.0 >= $LIBGNOMEUI_REQUIRED ++ launchpad-integration + libglade-2.0 >= $LIBGLADE_REQUIRED \ + gconf-2.0 + gnome-desktop-2.0 >= $GNOME_DESKTOP_REQUIRED + libstartup-notification-1.0 >= $LIBSTARTUP_NOTIFICATION_REQUIRED + $LIBNOTIFY_PACKAGE + " 2>/dev/null` + else + pkg_failed=yes +@@ -23087,16 +23235,17 @@ + gmodule-2.0 + gio-unix-2.0 >= $GLIB_REQUIRED + gtk+-2.0 >= $GTK_REQUIRED + gtk+-unix-print-2.0 >= $GTK_REQUIRED + libxml-2.0 >= $LIBXML_REQUIRED + libxslt >= $LIBXSLT_REQUIRED + libgnome-2.0 >= $LIBGNOME_REQUIRED + libgnomeui-2.0 >= $LIBGNOMEUI_REQUIRED ++ launchpad-integration + libglade-2.0 >= $LIBGLADE_REQUIRED \ + gconf-2.0 + gnome-desktop-2.0 >= $GNOME_DESKTOP_REQUIRED + libstartup-notification-1.0 >= $LIBSTARTUP_NOTIFICATION_REQUIRED + $LIBNOTIFY_PACKAGE + "` + else + DEPENDENCIES_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors " +@@ -23104,16 +23253,17 @@ + gmodule-2.0 + gio-unix-2.0 >= $GLIB_REQUIRED + gtk+-2.0 >= $GTK_REQUIRED + gtk+-unix-print-2.0 >= $GTK_REQUIRED + libxml-2.0 >= $LIBXML_REQUIRED + libxslt >= $LIBXSLT_REQUIRED + libgnome-2.0 >= $LIBGNOME_REQUIRED + libgnomeui-2.0 >= $LIBGNOMEUI_REQUIRED ++ launchpad-integration + libglade-2.0 >= $LIBGLADE_REQUIRED \ + gconf-2.0 + gnome-desktop-2.0 >= $GNOME_DESKTOP_REQUIRED + libstartup-notification-1.0 >= $LIBSTARTUP_NOTIFICATION_REQUIRED + $LIBNOTIFY_PACKAGE + "` + fi + # Put the nasty error message in config.log where it belongs +@@ -23124,16 +23274,17 @@ + gmodule-2.0 + gio-unix-2.0 >= $GLIB_REQUIRED + gtk+-2.0 >= $GTK_REQUIRED + gtk+-unix-print-2.0 >= $GTK_REQUIRED + libxml-2.0 >= $LIBXML_REQUIRED + libxslt >= $LIBXSLT_REQUIRED + libgnome-2.0 >= $LIBGNOME_REQUIRED + libgnomeui-2.0 >= $LIBGNOMEUI_REQUIRED ++ launchpad-integration + libglade-2.0 >= $LIBGLADE_REQUIRED \ + gconf-2.0 + gnome-desktop-2.0 >= $GNOME_DESKTOP_REQUIRED + libstartup-notification-1.0 >= $LIBSTARTUP_NOTIFICATION_REQUIRED + $LIBNOTIFY_PACKAGE + ) were not met: + + $DEPENDENCIES_PKG_ERRORS +@@ -23150,16 +23301,17 @@ + gmodule-2.0 + gio-unix-2.0 >= $GLIB_REQUIRED + gtk+-2.0 >= $GTK_REQUIRED + gtk+-unix-print-2.0 >= $GTK_REQUIRED + libxml-2.0 >= $LIBXML_REQUIRED + libxslt >= $LIBXSLT_REQUIRED + libgnome-2.0 >= $LIBGNOME_REQUIRED + libgnomeui-2.0 >= $LIBGNOMEUI_REQUIRED ++ launchpad-integration + libglade-2.0 >= $LIBGLADE_REQUIRED \ + gconf-2.0 + gnome-desktop-2.0 >= $GNOME_DESKTOP_REQUIRED + libstartup-notification-1.0 >= $LIBSTARTUP_NOTIFICATION_REQUIRED + $LIBNOTIFY_PACKAGE + ) were not met: + + $DEPENDENCIES_PKG_ERRORS +@@ -23880,22 +24032,25 @@ + if test "${with_mozilla+set}" = set; then + withval=$with_mozilla; with_gecko=$withval + fi + + + gecko_cv_gecko=$with_gecko + + # Autodetect gecko +-_geckos="xulrunner firefox mozilla-firefox seamonkey mozilla" ++_geckos="xulrunner firefox mozilla-firefox seamonkey mozilla libxul-embedding libxul" + if test -z "$gecko_cv_gecko"; then + for lizard in $_geckos; do + if $PKG_CONFIG --exists $lizard-xpcom; then + gecko_cv_gecko=$lizard + break; ++ elif $PKG_CONFIG --exists $lizard-unstable; then ++ gecko_cv_gecko=$lizard ++ break; + fi + done + fi + + { echo "$as_me:$LINENO: result: $gecko_cv_gecko" >&5 + echo "${ECHO_T}$gecko_cv_gecko" >&6; } + + if test "x$gecko_cv_gecko" = "x"; then +@@ -23907,50 +24062,75 @@ + { { echo "$as_me:$LINENO: error: Unknown gecko \"$gecko_cv_gecko\" specified" >&5 + echo "$as_me: error: Unknown gecko \"$gecko_cv_gecko\" specified" >&2;} + { (exit 1); exit 1; }; } + else + + gecko_cv_have_gecko=yes + fi + ++{ echo "$as_me:$LINENO: checking manual gecko home set" >&5 ++echo $ECHO_N "checking manual gecko home set... $ECHO_C" >&6; } ++ ++ ++# Check whether --with-gecko-home was given. ++if test "${with_gecko_home+set}" = set; then ++ withval=$with_gecko_home; ++fi ++ ++ ++gecko_cv_gecko_home=$with_gecko_home ++ + # **************** + # Define variables + # **************** + + if test "$gecko_cv_have_gecko" = "yes"; then + + case "$gecko_cv_gecko" in + mozilla) gecko_cv_gecko_flavour=mozilla ;; + seamonkey) gecko_cv_gecko_flavour=mozilla ;; + *firefox) gecko_cv_gecko_flavour=toolkit ;; + xulrunner) gecko_cv_gecko_flavour=toolkit ;; ++libxul*) gecko_cv_gecko_flavour=toolkit ;; + esac + +-_GECKO_INCLUDE_ROOT="`$PKG_CONFIG --variable=includedir ${gecko_cv_gecko}-xpcom`" +-_GECKO_LIBDIR="`$PKG_CONFIG --variable=libdir ${gecko_cv_gecko}-xpcom`" +-_GECKO_HOME="`$PKG_CONFIG --variable=libdir ${gecko_cv_gecko}-xpcom`" +-_GECKO_PREFIX="`$PKG_CONFIG --variable=prefix ${gecko_cv_gecko}-xpcom`" +- ++if $PKG_CONFIG --exists ${gecko_cv_gecko}-xpcom; then ++ _GECKO_INCLUDE_ROOT="`$PKG_CONFIG --variable=includedir ${gecko_cv_gecko}-xpcom`" ++ _GECKO_CFLAGS="-I$_GECKO_INCLUDE_ROOT" ++ _GECKO_LIBDIR="`$PKG_CONFIG --variable=libdir ${gecko_cv_gecko}-xpcom`" ++ _GECKO_HOME="`$PKG_CONFIG --variable=libdir ${gecko_cv_gecko}-xpcom`" ++ _GECKO_PREFIX="`$PKG_CONFIG --variable=prefix ${gecko_cv_gecko}-xpcom`" ++ _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 --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}`" ++ _GECKO_NSPR=no # XXX asac: this is currently a blind guess and should be a AC test ++fi + fi # if gecko_cv_have_gecko + + if test "$gecko_cv_gecko_flavour" = "toolkit"; then + + cat >>confdefs.h <<\_ACEOF + #define HAVE_MOZILLA_TOOLKIT 1 + _ACEOF + + fi + + GECKO=$gecko_cv_gecko + GECKO_FLAVOUR=$gecko_cv_gecko_flavour + GECKO_INCLUDE_ROOT=$_GECKO_INCLUDE_ROOT ++GECKO_CFLAGS=$_GECKO_CFLAGS + GECKO_LIBDIR=$_GECKO_LIBDIR + GECKO_HOME=$_GECKO_HOME + GECKO_PREFIX=$_GECKO_PREFIX ++GECKO_NSPR=$_GECKO_NSPR + + # ************************************************************** + # This is really gcc-only + # Do this test using CXX only since some versions of gcc + # 2.95-2.97 have a signed wchar_t in c++ only and some versions + # only have short-wchar support for c++. + # ************************************************************** + +@@ -24077,17 +24257,17 @@ + ac_ext=cpp + ac_cpp='$CXXCPP $CPPFLAGS' + ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' + ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' + ac_compiler_gnu=$ac_cv_cxx_compiler_gnu + + + _SAVE_CPPFLAGS="$CPPFLAGS" +-CPPFLAGS="$CPPFLAGS $_GECKO_EXTRA_CPPFLAGS -I$_GECKO_INCLUDE_ROOT" ++CPPFLAGS="$CPPFLAGS $_GECKO_EXTRA_CPPFLAGS $_GECKO_CFLAGS" + + { echo "$as_me:$LINENO: checking whether we have a gtk 2 gecko build" >&5 + echo $ECHO_N "checking whether we have a gtk 2 gecko build... $ECHO_C" >&6; } + if test "$cross_compiling" = yes; then + result=maybe + else + cat >conftest.$ac_ext <<_ACEOF + /* confdefs.h. */ +@@ -24183,16 +24363,59 @@ + + gecko_cv_have_debug=no + fi + + rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + { echo "$as_me:$LINENO: result: $gecko_cv_have_debug" >&5 + echo "${ECHO_T}$gecko_cv_have_debug" >&6; } + ++{ echo "$as_me:$LINENO: checking whether we have a xpcom glue" >&5 ++echo $ECHO_N "checking whether we have a xpcom glue... $ECHO_C" >&6; } ++cat >conftest.$ac_ext <<_ACEOF ++/* confdefs.h. */ ++_ACEOF ++cat confdefs.h >>conftest.$ac_ext ++cat >>conftest.$ac_ext <<_ACEOF ++/* end confdefs.h. */ ++ ++ #ifndef XPCOM_GLUE ++ #error "no xpcom glue found" ++ #endif ++ ++_ACEOF ++rm -f conftest.$ac_objext ++if { (ac_try="$ac_compile" ++case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ++ (eval "$ac_compile") 2>conftest.er1 ++ ac_status=$? ++ grep -v '^ *+' conftest.er1 >conftest.err ++ rm -f conftest.er1 ++ cat conftest.err >&5 ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ (exit $ac_status); } && { ++ test -z "$ac_cxx_werror_flag" || ++ test ! -s conftest.err ++ } && test -s conftest.$ac_objext; then ++ gecko_cv_have_xpcom_glue=yes ++else ++ echo "$as_me: failed program was:" >&5 ++sed 's/^/| /' conftest.$ac_ext >&5 ++ ++ gecko_cv_have_xpcom_glue=no ++fi ++ ++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext ++{ echo "$as_me:$LINENO: result: $gecko_cv_have_xpcom_glue" >&5 ++echo "${ECHO_T}$gecko_cv_have_xpcom_glue" >&6; } ++ + CPPFLAGS="$_SAVE_CPPFLAGS" + + ac_ext=c + ac_cpp='$CPP $CPPFLAGS' + ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' + ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' + ac_compiler_gnu=$ac_cv_c_compiler_gnu + +@@ -24203,34 +24426,58 @@ + + + cat >>confdefs.h <<\_ACEOF + #define HAVE_GECKO_DEBUG 1 + _ACEOF + + fi + ++if test "$gecko_cv_have_xpcom_glue" = "yes"; then ++ ++cat >>confdefs.h <<\_ACEOF ++#define HAVE_GECKO_XPCOM_GLUE 1 ++_ACEOF ++ ++fi ++ + fi # if gecko_cv_have_gecko + ++ if test "$gecko_cv_have_debug" = "yes"; then ++ HAVE_GECKO_DEBUG_TRUE= ++ HAVE_GECKO_DEBUG_FALSE='#' ++else ++ HAVE_GECKO_DEBUG_TRUE='#' ++ HAVE_GECKO_DEBUG_FALSE= ++fi ++ ++ if test "$gecko_cv_have_xpcom_glue" = "yes"; then ++ HAVE_GECKO_XPCOM_GLUE_TRUE= ++ HAVE_GECKO_XPCOM_GLUE_FALSE='#' ++else ++ HAVE_GECKO_XPCOM_GLUE_TRUE='#' ++ HAVE_GECKO_XPCOM_GLUE_FALSE= ++fi ++ + + # *********************** + # Check for gecko version + # *********************** + + if test "$gecko_cv_have_gecko" = "yes"; then + + ac_ext=cpp + ac_cpp='$CXXCPP $CPPFLAGS' + ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' + ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' + ac_compiler_gnu=$ac_cv_cxx_compiler_gnu + + + _SAVE_CPPFLAGS="$CPPFLAGS" +-CPPFLAGS="$CPPFLAGS -I$_GECKO_INCLUDE_ROOT" ++CPPFLAGS="$CPPFLAGS $_GECKO_CFLAGS" + + { echo "$as_me:$LINENO: checking for gecko version" >&5 + echo $ECHO_N "checking for gecko version... $ECHO_C" >&6; } + if test "${gecko_cv_gecko_version+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 + else + if test "$cross_compiling" = yes; then + gecko_cv_gecko_version="1.7" +@@ -24381,18 +24628,21 @@ + # Packages that we need to check for with pkg-config + # ************************************************** + + gecko_cv_extra_libs= + gecko_cv_glue_libs= + gecko_cv_extra_pkg_dependencies= + + if test "$gecko_cv_gecko_version_int" -ge "1009000"; then +- gecko_cv_extra_libs="-L$_GECKO_LIBDIR -lxul" +- gecko_cv_glue_libs="-L$_GECKO_LIBDIR -lxpcomglue_s" ++ if ! test "$gecko_cv_have_xpcom_glue" = "yes"; then ++ gecko_cv_extra_libs="-L$_GECKO_LIBDIR -lxul" ++ else ++ gecko_cv_glue_libs="-L$_GECKO_LIBDIR -lxpcomglue" ++ fi + else + gecko_cv_extra_pkg_dependencies="${gecko_cv_gecko}-gtkmozembed" + fi + + GECKO_EXTRA_PKG_DEPENDENCIES="$gecko_cv_extra_pkg_dependencies" + GECKO_EXTRA_LIBS="$gecko_cv_extra_libs" + GECKO_GLUE_LIBS="$gecko_cv_glue_libs" + +@@ -24421,57 +24671,59 @@ + if test "$gecko_cv_gecko_flavour" != "toolkit"; then + { { echo "$as_me:$LINENO: error: \"$gecko_cv_gecko_flavour\" flavoured geckos aren't tasty enough!" >&5 + echo "$as_me: error: \"$gecko_cv_gecko_flavour\" flavoured geckos aren't tasty enough!" >&2;} + { (exit 1); exit 1; }; } + fi + + case "$gecko_cv_gecko" in + xulrunner) min_version=1.8 ;; ++libxul*) min_version=1.9 ;; + *firefox) min_version=1.5 ;; + *) { { echo "$as_me:$LINENO: error: Unsupported gecko \"$gecko_cv_gecko\"" >&5 + echo "$as_me: error: Unsupported gecko \"$gecko_cv_gecko\"" >&2;} + { (exit 1); exit 1; }; } ;; + esac + + # Added $gecko_cv_gecko-js for debian xulrunner brokenness ++if test $gecko_cv_gecko != "libxul-embedding" -a $gecko_cv_gecko != "libxul"; then + + pkg_failed=no + { echo "$as_me:$LINENO: checking for GECKO" >&5 + echo $ECHO_N "checking for GECKO... $ECHO_C" >&6; } + + if test -n "$PKG_CONFIG"; then + if test -n "$GECKO_CFLAGS"; then + pkg_cv_GECKO_CFLAGS="$GECKO_CFLAGS" + else + if test -n "$PKG_CONFIG" && \ +- { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"\${gecko_cv_gecko}-xpcom >= \$min_version \${gecko_cv_gecko}-js \$gecko_cv_extra_pkg_dependencies\"") >&5 +- ($PKG_CONFIG --exists --print-errors "${gecko_cv_gecko}-xpcom >= $min_version ${gecko_cv_gecko}-js $gecko_cv_extra_pkg_dependencies") 2>&5 ++ { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \" \${gecko_cv_gecko}-xpcom >= \$min_version \${gecko_cv_gecko}-js \$gecko_cv_extra_pkg_dependencies\"") >&5 ++ ($PKG_CONFIG --exists --print-errors " ${gecko_cv_gecko}-xpcom >= $min_version ${gecko_cv_gecko}-js $gecko_cv_extra_pkg_dependencies") 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; then +- pkg_cv_GECKO_CFLAGS=`$PKG_CONFIG --cflags "${gecko_cv_gecko}-xpcom >= $min_version ${gecko_cv_gecko}-js $gecko_cv_extra_pkg_dependencies" 2>/dev/null` ++ pkg_cv_GECKO_CFLAGS=`$PKG_CONFIG --cflags " ${gecko_cv_gecko}-xpcom >= $min_version ${gecko_cv_gecko}-js $gecko_cv_extra_pkg_dependencies" 2>/dev/null` + else + pkg_failed=yes + fi + fi + else + pkg_failed=untried + fi + if test -n "$PKG_CONFIG"; then + if test -n "$GECKO_LIBS"; then + pkg_cv_GECKO_LIBS="$GECKO_LIBS" + else + if test -n "$PKG_CONFIG" && \ +- { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"\${gecko_cv_gecko}-xpcom >= \$min_version \${gecko_cv_gecko}-js \$gecko_cv_extra_pkg_dependencies\"") >&5 +- ($PKG_CONFIG --exists --print-errors "${gecko_cv_gecko}-xpcom >= $min_version ${gecko_cv_gecko}-js $gecko_cv_extra_pkg_dependencies") 2>&5 ++ { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \" \${gecko_cv_gecko}-xpcom >= \$min_version \${gecko_cv_gecko}-js \$gecko_cv_extra_pkg_dependencies\"") >&5 ++ ($PKG_CONFIG --exists --print-errors " ${gecko_cv_gecko}-xpcom >= $min_version ${gecko_cv_gecko}-js $gecko_cv_extra_pkg_dependencies") 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; then +- pkg_cv_GECKO_LIBS=`$PKG_CONFIG --libs "${gecko_cv_gecko}-xpcom >= $min_version ${gecko_cv_gecko}-js $gecko_cv_extra_pkg_dependencies" 2>/dev/null` ++ pkg_cv_GECKO_LIBS=`$PKG_CONFIG --libs " ${gecko_cv_gecko}-xpcom >= $min_version ${gecko_cv_gecko}-js $gecko_cv_extra_pkg_dependencies" 2>/dev/null` + else + pkg_failed=yes + fi + fi + else + pkg_failed=untried + fi + +@@ -24480,35 +24732,35 @@ + if test $pkg_failed = yes; then + + if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then + _pkg_short_errors_supported=yes + else + _pkg_short_errors_supported=no + fi + if test $_pkg_short_errors_supported = yes; then +- GECKO_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "${gecko_cv_gecko}-xpcom >= $min_version ${gecko_cv_gecko}-js $gecko_cv_extra_pkg_dependencies"` ++ GECKO_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors " ${gecko_cv_gecko}-xpcom >= $min_version ${gecko_cv_gecko}-js $gecko_cv_extra_pkg_dependencies"` + else +- GECKO_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "${gecko_cv_gecko}-xpcom >= $min_version ${gecko_cv_gecko}-js $gecko_cv_extra_pkg_dependencies"` ++ GECKO_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors " ${gecko_cv_gecko}-xpcom >= $min_version ${gecko_cv_gecko}-js $gecko_cv_extra_pkg_dependencies"` + fi + # Put the nasty error message in config.log where it belongs + echo "$GECKO_PKG_ERRORS" >&5 + +- { { echo "$as_me:$LINENO: error: Package requirements (${gecko_cv_gecko}-xpcom >= $min_version ${gecko_cv_gecko}-js $gecko_cv_extra_pkg_dependencies) were not met: ++ { { echo "$as_me:$LINENO: error: Package requirements ( ${gecko_cv_gecko}-xpcom >= $min_version ${gecko_cv_gecko}-js $gecko_cv_extra_pkg_dependencies) were not met: + + $GECKO_PKG_ERRORS + + Consider adjusting the PKG_CONFIG_PATH environment variable if you + installed software in a non-standard prefix. + + Alternatively, you may set the environment variables GECKO_CFLAGS + and GECKO_LIBS to avoid the need to call pkg-config. + See the pkg-config man page for more details. + " >&5 +-echo "$as_me: error: Package requirements (${gecko_cv_gecko}-xpcom >= $min_version ${gecko_cv_gecko}-js $gecko_cv_extra_pkg_dependencies) were not met: ++echo "$as_me: error: Package requirements ( ${gecko_cv_gecko}-xpcom >= $min_version ${gecko_cv_gecko}-js $gecko_cv_extra_pkg_dependencies) were not met: + + $GECKO_PKG_ERRORS + + Consider adjusting the PKG_CONFIG_PATH environment variable if you + installed software in a non-standard prefix. + + Alternatively, you may set the environment variables GECKO_CFLAGS + and GECKO_LIBS to avoid the need to call pkg-config. +@@ -24539,16 +24791,53 @@ + { (exit 1); exit 1; }; } + else + GECKO_CFLAGS=$pkg_cv_GECKO_CFLAGS + GECKO_LIBS=$pkg_cv_GECKO_LIBS + { echo "$as_me:$LINENO: result: yes" >&5 + echo "${ECHO_T}yes" >&6; } + : + fi ++else ++ GECKO_CFLAGS="$GECKO_CFLAGS -UDEBUG" ++ GECKO_LIBS="$GECKO_LIBS `pkg-config --libs ${gecko_cv_gecko}`" ++fi ++ ++{ echo "$as_me:$LINENO: checking nspr in gecko" >&5 ++echo $ECHO_N "checking nspr in gecko... $ECHO_C" >&6; } ++if test "$GECKO_NSPR" != yes; then ++ { echo "$as_me:$LINENO: result: no" >&5 ++echo "${ECHO_T}no" >&6; } ++ { echo "$as_me:$LINENO: checking nspr in system" >&5 ++echo $ECHO_N "checking nspr in system... $ECHO_C" >&6; } ++ gecko_nspr= ++ if $PKG_CONFIG --exists mozilla-nspr; then ++ gecko_nspr=mozilla-nspr ++ elif $PKG_CONFIG --exists ${gecko_cv_gecko}-nspr; then ++ gecko_nspr=${gecko_cv_gecko}-nspr ++ fi ++ if $PKG_CONFIG --exists nspr; then ++ gecko_nspr=nspr ++ fi ++ if test -z "$gecko_nspr"; then ++ { { echo "$as_me:$LINENO: error: no nspr available" >&5 ++echo "$as_me: error: no nspr available" >&2;} ++ { (exit 1); exit 1; }; } ++ fi ++ ++ GECKO_CFLAGS="$GECKO_CFLAGS `$PKG_CONFIG --cflags ${gecko_nspr}`" ++ GECKO_LIBS="$GECKO_LIBS `$PKG_CONFIG --libs ${gecko_nspr}`" ++ _GECKO_CFLAGS="$GECKO_CFLAGS" ++ { echo "$as_me:$LINENO: result: yes" >&5 ++echo "${ECHO_T}yes" >&6; } ++else ++ { echo "$as_me:$LINENO: result: yes" >&5 ++echo "${ECHO_T}yes" >&6; } ++fi ++ + + + + # ***************** + # Weasel UA version + # ***************** + + # FIXMEchpe: find a way to always automatically use the latest weasel minor version! +@@ -24595,71 +24884,110 @@ + ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' + ac_compiler_gnu=$ac_cv_cxx_compiler_gnu + + + _SAVE_CPPFLAGS="$CPPFLAGS" + _SAVE_CXXFLAGS="$CXXFLAGS" + _SAVE_LDFLAGS="$LDFLAGS" + _SAVE_LIBS="$LIBS" +-CPPFLAGS="$CPPFLAGS $_GECKO_EXTRA_CPPFLAGS -I$_GECKO_INCLUDE_ROOT $($PKG_CONFIG --cflags-only-I ${gecko_cv_gecko}-xpcom)" +-CXXFLAGS="$CXXFLAGS $_GECKO_EXTRA_CXXFLAGS $($PKG_CONFIG --cflags-only-other ${gecko_cv_gecko}-xpcom)" +-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 --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)" ++ CXXFLAGS="$CXXFLAGS $_GECKO_EXTRA_CXXFLAGS $_GECKO_CFLAGS $($PKG_CONFIG --cflags-only-other ${gecko_cv_gecko}-xpcom)" ++ LIBS="$LIBS $($PKG_CONFIG --libs ${gecko_cv_gecko}-xpcom)" ++fi ++if test -n "$_GECKO_HOME"; then ++ LDFLAGS="$LDFLAGS $_GECKO_EXTRA_LDFLAGS -Wl,--rpath=$_GECKO_HOME" ++else ++ LDFLAGS="$LDFLAGS $_GECKO_EXTRA_LDFLAGS" ++fi + + _GECKO_DISPATCH_INCLUDEDIRS="" + + # Sigh Gentoo has a rubbish header layout + # http://bugs.gentoo.org/show_bug.cgi?id=100804 + # Mind you, it's useful to be able to test against uninstalled mozilla builds... + _GECKO_DISPATCH_INCLUDEDIRS="$_GECKO_DISPATCH_INCLUDEDIRS dom necko pref" + +-# Now add them to CPPFLAGS ++# Now add them to CPPFLAGS - asac: well ... not anymore since 1.9 -> test whether they exist before adding. + for i in $_GECKO_DISPATCH_INCLUDEDIRS; do +- CPPFLAGS="$CPPFLAGS -I$_GECKO_INCLUDE_ROOT/$i" ++ if test -d "$_GECKO_INCLUDE_ROOT/$i"; then ++ CPPFLAGS="$CPPFLAGS -I$_GECKO_INCLUDE_ROOT/$i" ++ fi + done + + if test "$cross_compiling" = yes; then + gecko_cv_xpcom_program_check=maybe + else + cat >conftest.$ac_ext <<_ACEOF + /* confdefs.h. */ + _ACEOF + cat confdefs.h >>conftest.$ac_ext + cat >>conftest.$ac_ext <<_ACEOF + /* end confdefs.h. */ + + #include + #include + #include ++ ++#ifdef XPCOM_GLUE ++#include ++#else + #include ++#endif // XPCOM_GLUE ++ + #include + #include + #include +-#ifdef HAVE_GECKO_1_8 ++#if defined(HAVE_GECKO_1_8) || defined(HAVE_GECKO_1_9) + #include + #else + #include + #endif + + + int + main () + { + ++ ++nsresult rv; ++#ifdef XPCOM_GLUE ++ static const GREVersionRange greVersion = { ++ "1.8", PR_TRUE, ++ "1.9.*", PR_TRUE ++ }; ++ char xpcomLocation[4096]; ++ rv = GRE_GetGREPathWithProperties(&greVersion, 1, nsnull, 0, xpcomLocation, 4096); ++ if (NS_FAILED(rv)) { ++ exit(123); ++ } ++ ++ // Startup the XPCOM Glue that links us up with XPCOM. ++ XPCOMGlueStartup(xpcomLocation); ++ if (NS_FAILED(rv)) { ++ exit(124); ++ } ++#endif // XPCOM_GLUE ++ + // redirect unwanted mozilla debug output to the bit bucket + freopen ("/dev/null", "w", stdout); + +-nsresult rv; +-nsCOMPtr directory; ++nsCOMPtr directory = nsnull; ++#ifndef XPCOM_GLUE + rv = NS_NewNativeLocalFile (NS_LITERAL_CSTRING("$_GECKO_HOME"), PR_FALSE, + getter_AddRefs (directory)); + if (NS_FAILED (rv) || !directory) { + exit (126); + } ++#endif + + rv = NS_InitXPCOM2 (nsnull, directory, nsnull); + if (NS_FAILED (rv)) { + exit (125); + } + + int status = EXIT_FAILURE; + +@@ -24764,71 +25092,110 @@ + ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' + ac_compiler_gnu=$ac_cv_cxx_compiler_gnu + + + _SAVE_CPPFLAGS="$CPPFLAGS" + _SAVE_CXXFLAGS="$CXXFLAGS" + _SAVE_LDFLAGS="$LDFLAGS" + _SAVE_LIBS="$LIBS" +-CPPFLAGS="$CPPFLAGS $_GECKO_EXTRA_CPPFLAGS -I$_GECKO_INCLUDE_ROOT $($PKG_CONFIG --cflags-only-I ${gecko_cv_gecko}-xpcom)" +-CXXFLAGS="$CXXFLAGS $_GECKO_EXTRA_CXXFLAGS $($PKG_CONFIG --cflags-only-other ${gecko_cv_gecko}-xpcom)" +-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 --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)" ++ CXXFLAGS="$CXXFLAGS $_GECKO_EXTRA_CXXFLAGS $_GECKO_CFLAGS $($PKG_CONFIG --cflags-only-other ${gecko_cv_gecko}-xpcom)" ++ LIBS="$LIBS $($PKG_CONFIG --libs ${gecko_cv_gecko}-xpcom)" ++fi ++if test -n "$_GECKO_HOME"; then ++ LDFLAGS="$LDFLAGS $_GECKO_EXTRA_LDFLAGS -Wl,--rpath=$_GECKO_HOME" ++else ++ LDFLAGS="$LDFLAGS $_GECKO_EXTRA_LDFLAGS" ++fi + + _GECKO_DISPATCH_INCLUDEDIRS="" + + # Sigh Gentoo has a rubbish header layout + # http://bugs.gentoo.org/show_bug.cgi?id=100804 + # Mind you, it's useful to be able to test against uninstalled mozilla builds... + _GECKO_DISPATCH_INCLUDEDIRS="$_GECKO_DISPATCH_INCLUDEDIRS dom necko pref" + +-# Now add them to CPPFLAGS ++# Now add them to CPPFLAGS - asac: well ... not anymore since 1.9 -> test whether they exist before adding. + for i in $_GECKO_DISPATCH_INCLUDEDIRS; do +- CPPFLAGS="$CPPFLAGS -I$_GECKO_INCLUDE_ROOT/$i" ++ if test -d "$_GECKO_INCLUDE_ROOT/$i"; then ++ CPPFLAGS="$CPPFLAGS -I$_GECKO_INCLUDE_ROOT/$i" ++ fi + done + + if test "$cross_compiling" = yes; then + have_broken_typeaheadfind=maybe + else + cat >conftest.$ac_ext <<_ACEOF + /* confdefs.h. */ + _ACEOF + cat confdefs.h >>conftest.$ac_ext + cat >>conftest.$ac_ext <<_ACEOF + /* end confdefs.h. */ + + #include + #include + #include ++ ++#ifdef XPCOM_GLUE ++#include ++#else + #include ++#endif // XPCOM_GLUE ++ + #include + #include + #include +-#ifdef HAVE_GECKO_1_8 ++#if defined(HAVE_GECKO_1_8) || defined(HAVE_GECKO_1_9) + #include + #else + #include + #endif + + #include + int + main () + { + ++ ++nsresult rv; ++#ifdef XPCOM_GLUE ++ static const GREVersionRange greVersion = { ++ "1.8", PR_TRUE, ++ "1.9.*", PR_TRUE ++ }; ++ char xpcomLocation[4096]; ++ rv = GRE_GetGREPathWithProperties(&greVersion, 1, nsnull, 0, xpcomLocation, 4096); ++ if (NS_FAILED(rv)) { ++ exit(123); ++ } ++ ++ // Startup the XPCOM Glue that links us up with XPCOM. ++ XPCOMGlueStartup(xpcomLocation); ++ if (NS_FAILED(rv)) { ++ exit(124); ++ } ++#endif // XPCOM_GLUE ++ + // redirect unwanted mozilla debug output to the bit bucket + freopen ("/dev/null", "w", stdout); + +-nsresult rv; +-nsCOMPtr directory; ++nsCOMPtr directory = nsnull; ++#ifndef XPCOM_GLUE + rv = NS_NewNativeLocalFile (NS_LITERAL_CSTRING("$_GECKO_HOME"), PR_FALSE, + getter_AddRefs (directory)); + if (NS_FAILED (rv) || !directory) { + exit (126); + } ++#endif + + rv = NS_InitXPCOM2 (nsnull, directory, nsnull); + if (NS_FAILED (rv)) { + exit (125); + } + + int status = EXIT_FAILURE; + +@@ -24940,31 +25307,43 @@ + ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' + ac_compiler_gnu=$ac_cv_cxx_compiler_gnu + + + _SAVE_CPPFLAGS="$CPPFLAGS" + _SAVE_CXXFLAGS="$CXXFLAGS" + _SAVE_LDFLAGS="$LDFLAGS" + _SAVE_LIBS="$LIBS" +-CPPFLAGS="$CPPFLAGS $_GECKO_EXTRA_CPPFLAGS -I$_GECKO_INCLUDE_ROOT $($PKG_CONFIG --cflags-only-I ${gecko_cv_gecko}-xpcom)" +-CXXFLAGS="$CXXFLAGS $_GECKO_EXTRA_CXXFLAGS $($PKG_CONFIG --cflags-only-other ${gecko_cv_gecko}-xpcom)" +-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 --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)" ++ CXXFLAGS="$CXXFLAGS $_GECKO_EXTRA_CXXFLAGS $_GECKO_CFLAGS $($PKG_CONFIG --cflags-only-other ${gecko_cv_gecko}-xpcom)" ++ LIBS="$LIBS $($PKG_CONFIG --libs ${gecko_cv_gecko}-xpcom)" ++fi ++if test -n "$_GECKO_HOME"; then ++ LDFLAGS="$LDFLAGS $_GECKO_EXTRA_LDFLAGS -Wl,--rpath=$_GECKO_HOME" ++else ++ LDFLAGS="$LDFLAGS $_GECKO_EXTRA_LDFLAGS" ++fi + + _GECKO_DISPATCH_INCLUDEDIRS="pipnss" + + # Sigh Gentoo has a rubbish header layout + # http://bugs.gentoo.org/show_bug.cgi?id=100804 + # Mind you, it's useful to be able to test against uninstalled mozilla builds... + _GECKO_DISPATCH_INCLUDEDIRS="$_GECKO_DISPATCH_INCLUDEDIRS dom necko pref" + +-# Now add them to CPPFLAGS ++# Now add them to CPPFLAGS - asac: well ... not anymore since 1.9 -> test whether they exist before adding. + for i in $_GECKO_DISPATCH_INCLUDEDIRS; do +- CPPFLAGS="$CPPFLAGS -I$_GECKO_INCLUDE_ROOT/$i" ++ if test -d "$_GECKO_INCLUDE_ROOT/$i"; then ++ CPPFLAGS="$CPPFLAGS -I$_GECKO_INCLUDE_ROOT/$i" ++ fi + done + + + for ac_header in nsIX509Cert.h + do + as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` + if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then + { echo "$as_me:$LINENO: checking for $ac_header" >&5 +@@ -25196,31 +25575,43 @@ + ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' + ac_compiler_gnu=$ac_cv_cxx_compiler_gnu + + + _SAVE_CPPFLAGS="$CPPFLAGS" + _SAVE_CXXFLAGS="$CXXFLAGS" + _SAVE_LDFLAGS="$LDFLAGS" + _SAVE_LIBS="$LIBS" +-CPPFLAGS="$CPPFLAGS $_GECKO_EXTRA_CPPFLAGS -I$_GECKO_INCLUDE_ROOT $($PKG_CONFIG --cflags-only-I ${gecko_cv_gecko}-xpcom)" +-CXXFLAGS="$CXXFLAGS $_GECKO_EXTRA_CXXFLAGS $($PKG_CONFIG --cflags-only-other ${gecko_cv_gecko}-xpcom)" +-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 --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)" ++ CXXFLAGS="$CXXFLAGS $_GECKO_EXTRA_CXXFLAGS $_GECKO_CFLAGS $($PKG_CONFIG --cflags-only-other ${gecko_cv_gecko}-xpcom)" ++ LIBS="$LIBS $($PKG_CONFIG --libs ${gecko_cv_gecko}-xpcom)" ++fi ++if test -n "$_GECKO_HOME"; then ++ LDFLAGS="$LDFLAGS $_GECKO_EXTRA_LDFLAGS -Wl,--rpath=$_GECKO_HOME" ++else ++ LDFLAGS="$LDFLAGS $_GECKO_EXTRA_LDFLAGS" ++fi + + _GECKO_DISPATCH_INCLUDEDIRS="windowwatcher" + + # Sigh Gentoo has a rubbish header layout + # http://bugs.gentoo.org/show_bug.cgi?id=100804 + # Mind you, it's useful to be able to test against uninstalled mozilla builds... + _GECKO_DISPATCH_INCLUDEDIRS="$_GECKO_DISPATCH_INCLUDEDIRS dom necko pref" + +-# Now add them to CPPFLAGS ++# Now add them to CPPFLAGS - asac: well ... not anymore since 1.9 -> test whether they exist before adding. + for i in $_GECKO_DISPATCH_INCLUDEDIRS; do +- CPPFLAGS="$CPPFLAGS -I$_GECKO_INCLUDE_ROOT/$i" ++ if test -d "$_GECKO_INCLUDE_ROOT/$i"; then ++ CPPFLAGS="$CPPFLAGS -I$_GECKO_INCLUDE_ROOT/$i" ++ fi + done + + + for ac_header in nsINonBlockingAlertService.h + do + as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` + if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then + { echo "$as_me:$LINENO: checking for $ac_header" >&5 +@@ -25397,31 +25788,43 @@ + ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' + ac_compiler_gnu=$ac_cv_cxx_compiler_gnu + + + _SAVE_CPPFLAGS="$CPPFLAGS" + _SAVE_CXXFLAGS="$CXXFLAGS" + _SAVE_LDFLAGS="$LDFLAGS" + _SAVE_LIBS="$LIBS" +-CPPFLAGS="$CPPFLAGS $_GECKO_EXTRA_CPPFLAGS -I$_GECKO_INCLUDE_ROOT $($PKG_CONFIG --cflags-only-I ${gecko_cv_gecko}-xpcom)" +-CXXFLAGS="$CXXFLAGS $_GECKO_EXTRA_CXXFLAGS $($PKG_CONFIG --cflags-only-other ${gecko_cv_gecko}-xpcom)" +-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 --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)" ++ CXXFLAGS="$CXXFLAGS $_GECKO_EXTRA_CXXFLAGS $_GECKO_CFLAGS $($PKG_CONFIG --cflags-only-other ${gecko_cv_gecko}-xpcom)" ++ LIBS="$LIBS $($PKG_CONFIG --libs ${gecko_cv_gecko}-xpcom)" ++fi ++if test -n "$_GECKO_HOME"; then ++ LDFLAGS="$LDFLAGS $_GECKO_EXTRA_LDFLAGS -Wl,--rpath=$_GECKO_HOME" ++else ++ LDFLAGS="$LDFLAGS $_GECKO_EXTRA_LDFLAGS" ++fi + + _GECKO_DISPATCH_INCLUDEDIRS="docshell" + + # Sigh Gentoo has a rubbish header layout + # http://bugs.gentoo.org/show_bug.cgi?id=100804 + # Mind you, it's useful to be able to test against uninstalled mozilla builds... + _GECKO_DISPATCH_INCLUDEDIRS="$_GECKO_DISPATCH_INCLUDEDIRS dom necko pref" + +-# Now add them to CPPFLAGS ++# Now add them to CPPFLAGS - asac: well ... not anymore since 1.9 -> test whether they exist before adding. + for i in $_GECKO_DISPATCH_INCLUDEDIRS; do +- CPPFLAGS="$CPPFLAGS -I$_GECKO_INCLUDE_ROOT/$i" ++ if test -d "$_GECKO_INCLUDE_ROOT/$i"; then ++ CPPFLAGS="$CPPFLAGS -I$_GECKO_INCLUDE_ROOT/$i" ++ fi + done + + + for ac_header in nsIGlobalHistory3.h + do + as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` + if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then + { echo "$as_me:$LINENO: checking for $ac_header" >&5 +@@ -25598,31 +26001,43 @@ + ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' + ac_compiler_gnu=$ac_cv_cxx_compiler_gnu + + + _SAVE_CPPFLAGS="$CPPFLAGS" + _SAVE_CXXFLAGS="$CXXFLAGS" + _SAVE_LDFLAGS="$LDFLAGS" + _SAVE_LIBS="$LIBS" +-CPPFLAGS="$CPPFLAGS $_GECKO_EXTRA_CPPFLAGS -I$_GECKO_INCLUDE_ROOT $($PKG_CONFIG --cflags-only-I ${gecko_cv_gecko}-xpcom)" +-CXXFLAGS="$CXXFLAGS $_GECKO_EXTRA_CXXFLAGS $($PKG_CONFIG --cflags-only-other ${gecko_cv_gecko}-xpcom)" +-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 --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)" ++ CXXFLAGS="$CXXFLAGS $_GECKO_EXTRA_CXXFLAGS $_GECKO_CFLAGS $($PKG_CONFIG --cflags-only-other ${gecko_cv_gecko}-xpcom)" ++ LIBS="$LIBS $($PKG_CONFIG --libs ${gecko_cv_gecko}-xpcom)" ++fi ++if test -n "$_GECKO_HOME"; then ++ LDFLAGS="$LDFLAGS $_GECKO_EXTRA_LDFLAGS -Wl,--rpath=$_GECKO_HOME" ++else ++ LDFLAGS="$LDFLAGS $_GECKO_EXTRA_LDFLAGS" ++fi + + _GECKO_DISPATCH_INCLUDEDIRS="necko" + + # Sigh Gentoo has a rubbish header layout + # http://bugs.gentoo.org/show_bug.cgi?id=100804 + # Mind you, it's useful to be able to test against uninstalled mozilla builds... + _GECKO_DISPATCH_INCLUDEDIRS="$_GECKO_DISPATCH_INCLUDEDIRS dom necko pref" + +-# Now add them to CPPFLAGS ++# Now add them to CPPFLAGS - asac: well ... not anymore since 1.9 -> test whether they exist before adding. + for i in $_GECKO_DISPATCH_INCLUDEDIRS; do +- CPPFLAGS="$CPPFLAGS -I$_GECKO_INCLUDE_ROOT/$i" ++ if test -d "$_GECKO_INCLUDE_ROOT/$i"; then ++ CPPFLAGS="$CPPFLAGS -I$_GECKO_INCLUDE_ROOT/$i" ++ fi + done + + + for ac_header in nsIIOService2.h + do + as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` + if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then + { echo "$as_me:$LINENO: checking for $ac_header" >&5 +@@ -25799,31 +26214,43 @@ + ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' + ac_compiler_gnu=$ac_cv_cxx_compiler_gnu + + + _SAVE_CPPFLAGS="$CPPFLAGS" + _SAVE_CXXFLAGS="$CXXFLAGS" + _SAVE_LDFLAGS="$LDFLAGS" + _SAVE_LIBS="$LIBS" +-CPPFLAGS="$CPPFLAGS $_GECKO_EXTRA_CPPFLAGS -I$_GECKO_INCLUDE_ROOT $($PKG_CONFIG --cflags-only-I ${gecko_cv_gecko}-xpcom)" +-CXXFLAGS="$CXXFLAGS $_GECKO_EXTRA_CXXFLAGS $($PKG_CONFIG --cflags-only-other ${gecko_cv_gecko}-xpcom)" +-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 --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)" ++ CXXFLAGS="$CXXFLAGS $_GECKO_EXTRA_CXXFLAGS $_GECKO_CFLAGS $($PKG_CONFIG --cflags-only-other ${gecko_cv_gecko}-xpcom)" ++ LIBS="$LIBS $($PKG_CONFIG --libs ${gecko_cv_gecko}-xpcom)" ++fi ++if test -n "$_GECKO_HOME"; then ++ LDFLAGS="$LDFLAGS $_GECKO_EXTRA_LDFLAGS -Wl,--rpath=$_GECKO_HOME" ++else ++ LDFLAGS="$LDFLAGS $_GECKO_EXTRA_LDFLAGS" ++fi + + _GECKO_DISPATCH_INCLUDEDIRS="xpcom" + + # Sigh Gentoo has a rubbish header layout + # http://bugs.gentoo.org/show_bug.cgi?id=100804 + # Mind you, it's useful to be able to test against uninstalled mozilla builds... + _GECKO_DISPATCH_INCLUDEDIRS="$_GECKO_DISPATCH_INCLUDEDIRS dom necko pref" + +-# Now add them to CPPFLAGS ++# Now add them to CPPFLAGS - asac: well ... not anymore since 1.9 -> test whether they exist before adding. + for i in $_GECKO_DISPATCH_INCLUDEDIRS; do +- CPPFLAGS="$CPPFLAGS -I$_GECKO_INCLUDE_ROOT/$i" ++ if test -d "$_GECKO_INCLUDE_ROOT/$i"; then ++ CPPFLAGS="$CPPFLAGS -I$_GECKO_INCLUDE_ROOT/$i" ++ fi + done + + + for ac_header in nsIMutableArray.h + do + as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` + if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then + { echo "$as_me:$LINENO: checking for $ac_header" >&5 +@@ -25999,31 +26426,43 @@ + ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' + ac_compiler_gnu=$ac_cv_cxx_compiler_gnu + + + _SAVE_CPPFLAGS="$CPPFLAGS" + _SAVE_CXXFLAGS="$CXXFLAGS" + _SAVE_LDFLAGS="$LDFLAGS" + _SAVE_LIBS="$LIBS" +-CPPFLAGS="$CPPFLAGS $_GECKO_EXTRA_CPPFLAGS -I$_GECKO_INCLUDE_ROOT $($PKG_CONFIG --cflags-only-I ${gecko_cv_gecko}-xpcom)" +-CXXFLAGS="$CXXFLAGS $_GECKO_EXTRA_CXXFLAGS $($PKG_CONFIG --cflags-only-other ${gecko_cv_gecko}-xpcom)" +-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 --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)" ++ CXXFLAGS="$CXXFLAGS $_GECKO_EXTRA_CXXFLAGS $_GECKO_CFLAGS $($PKG_CONFIG --cflags-only-other ${gecko_cv_gecko}-xpcom)" ++ LIBS="$LIBS $($PKG_CONFIG --libs ${gecko_cv_gecko}-xpcom)" ++fi ++if test -n "$_GECKO_HOME"; then ++ LDFLAGS="$LDFLAGS $_GECKO_EXTRA_LDFLAGS -Wl,--rpath=$_GECKO_HOME" ++else ++ LDFLAGS="$LDFLAGS $_GECKO_EXTRA_LDFLAGS" ++fi + + _GECKO_DISPATCH_INCLUDEDIRS="spellchecker" + + # Sigh Gentoo has a rubbish header layout + # http://bugs.gentoo.org/show_bug.cgi?id=100804 + # Mind you, it's useful to be able to test against uninstalled mozilla builds... + _GECKO_DISPATCH_INCLUDEDIRS="$_GECKO_DISPATCH_INCLUDEDIRS dom necko pref" + +-# Now add them to CPPFLAGS ++# Now add them to CPPFLAGS - asac: well ... not anymore since 1.9 -> test whether they exist before adding. + for i in $_GECKO_DISPATCH_INCLUDEDIRS; do +- CPPFLAGS="$CPPFLAGS -I$_GECKO_INCLUDE_ROOT/$i" ++ if test -d "$_GECKO_INCLUDE_ROOT/$i"; then ++ CPPFLAGS="$CPPFLAGS -I$_GECKO_INCLUDE_ROOT/$i" ++ fi + done + + + for ac_header in mozISpellCheckingEngine.h + do + as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` + if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then + { echo "$as_me:$LINENO: checking for $ac_header" >&5 +@@ -26222,73 +26661,112 @@ + ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' + ac_compiler_gnu=$ac_cv_cxx_compiler_gnu + + + _SAVE_CPPFLAGS="$CPPFLAGS" + _SAVE_CXXFLAGS="$CXXFLAGS" + _SAVE_LDFLAGS="$LDFLAGS" + _SAVE_LIBS="$LIBS" +-CPPFLAGS="$CPPFLAGS $_GECKO_EXTRA_CPPFLAGS -I$_GECKO_INCLUDE_ROOT $($PKG_CONFIG --cflags-only-I ${gecko_cv_gecko}-xpcom)" +-CXXFLAGS="$CXXFLAGS $_GECKO_EXTRA_CXXFLAGS $($PKG_CONFIG --cflags-only-other ${gecko_cv_gecko}-xpcom)" +-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 --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)" ++ CXXFLAGS="$CXXFLAGS $_GECKO_EXTRA_CXXFLAGS $_GECKO_CFLAGS $($PKG_CONFIG --cflags-only-other ${gecko_cv_gecko}-xpcom)" ++ LIBS="$LIBS $($PKG_CONFIG --libs ${gecko_cv_gecko}-xpcom)" ++fi ++if test -n "$_GECKO_HOME"; then ++ LDFLAGS="$LDFLAGS $_GECKO_EXTRA_LDFLAGS -Wl,--rpath=$_GECKO_HOME" ++else ++ LDFLAGS="$LDFLAGS $_GECKO_EXTRA_LDFLAGS" ++fi + + _GECKO_DISPATCH_INCLUDEDIRS="" + + # Sigh Gentoo has a rubbish header layout + # http://bugs.gentoo.org/show_bug.cgi?id=100804 + # Mind you, it's useful to be able to test against uninstalled mozilla builds... + _GECKO_DISPATCH_INCLUDEDIRS="$_GECKO_DISPATCH_INCLUDEDIRS dom necko pref" + +-# Now add them to CPPFLAGS ++# Now add them to CPPFLAGS - asac: well ... not anymore since 1.9 -> test whether they exist before adding. + for i in $_GECKO_DISPATCH_INCLUDEDIRS; do +- CPPFLAGS="$CPPFLAGS -I$_GECKO_INCLUDE_ROOT/$i" ++ if test -d "$_GECKO_INCLUDE_ROOT/$i"; then ++ CPPFLAGS="$CPPFLAGS -I$_GECKO_INCLUDE_ROOT/$i" ++ fi + done + + if test "$cross_compiling" = yes; then + eval "$as_gecko_cv_have_CID=maybe" + else + cat >conftest.$ac_ext <<_ACEOF + /* confdefs.h. */ + _ACEOF + cat confdefs.h >>conftest.$ac_ext + cat >>conftest.$ac_ext <<_ACEOF + /* end confdefs.h. */ + + #include + #include + #include ++ ++#ifdef XPCOM_GLUE ++#include ++#else + #include ++#endif // XPCOM_GLUE ++ + #include + #include + #include +-#ifdef HAVE_GECKO_1_8 ++#if defined(HAVE_GECKO_1_8) || defined(HAVE_GECKO_1_9) + #include + #else + #include + #endif + + + #include + + int + main () + { + ++ ++nsresult rv; ++#ifdef XPCOM_GLUE ++ static const GREVersionRange greVersion = { ++ "1.8", PR_TRUE, ++ "1.9.*", PR_TRUE ++ }; ++ char xpcomLocation[4096]; ++ rv = GRE_GetGREPathWithProperties(&greVersion, 1, nsnull, 0, xpcomLocation, 4096); ++ if (NS_FAILED(rv)) { ++ exit(123); ++ } ++ ++ // Startup the XPCOM Glue that links us up with XPCOM. ++ XPCOMGlueStartup(xpcomLocation); ++ if (NS_FAILED(rv)) { ++ exit(124); ++ } ++#endif // XPCOM_GLUE ++ + // redirect unwanted mozilla debug output to the bit bucket + freopen ("/dev/null", "w", stdout); + +-nsresult rv; +-nsCOMPtr directory; ++nsCOMPtr directory = nsnull; ++#ifndef XPCOM_GLUE + rv = NS_NewNativeLocalFile (NS_LITERAL_CSTRING("$_GECKO_HOME"), PR_FALSE, + getter_AddRefs (directory)); + if (NS_FAILED (rv) || !directory) { + exit (126); + } ++#endif + + rv = NS_InitXPCOM2 (nsnull, directory, nsnull); + if (NS_FAILED (rv)) { + exit (125); + } + + int status = EXIT_FAILURE; + +@@ -26446,16 +26924,24 @@ + if test "$gecko_cv_have_gecko" = "yes" -a "$gecko_cv_gecko_version_int" -ge "1009000"; then + HAVE_GECKO_1_9_TRUE= + HAVE_GECKO_1_9_FALSE='#' + else + HAVE_GECKO_1_9_TRUE='#' + HAVE_GECKO_1_9_FALSE= + fi + ++ if test "x$_GECKO_HOME" != "x"; then ++ HAVE_GECKO_HOME_TRUE= ++ HAVE_GECKO_HOME_FALSE='#' ++else ++ HAVE_GECKO_HOME_TRUE='#' ++ HAVE_GECKO_HOME_FALSE= ++fi ++ + + if test "$with_engine" = "mozilla"; then + WITH_GECKO_ENGINE_TRUE= + WITH_GECKO_ENGINE_FALSE='#' + else + WITH_GECKO_ENGINE_TRUE='#' + WITH_GECKO_ENGINE_FALSE= + fi +@@ -27769,16 +28255,129 @@ + else + enable_desktop_file_plugin=yes + fi + + { echo "$as_me:$LINENO: result: $enable_desktop_file_plugin" >&5 + echo "${ECHO_T}$enable_desktop_file_plugin" >&6; } + + if test "$enable_desktop_file_plugin" = "yes"; then ++ if test "${gecko_cv_gecko}" = "libxul-embedding" -o "${gecko_cv_gecko}" = "libxul"; then ++ ++pkg_failed=no ++{ echo "$as_me:$LINENO: checking for DESKTOP_FILE_PLUGIN_DEP" >&5 ++echo $ECHO_N "checking for DESKTOP_FILE_PLUGIN_DEP... $ECHO_C" >&6; } ++ ++if test -n "$PKG_CONFIG"; then ++ if test -n "$DESKTOP_FILE_PLUGIN_DEP_CFLAGS"; then ++ pkg_cv_DESKTOP_FILE_PLUGIN_DEP_CFLAGS="$DESKTOP_FILE_PLUGIN_DEP_CFLAGS" ++ else ++ if test -n "$PKG_CONFIG" && \ ++ { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"\${gecko_cv_gecko} mozilla-plugin gtk+-2.0 >= 2.6.0\"") >&5 ++ ($PKG_CONFIG --exists --print-errors "${gecko_cv_gecko} mozilla-plugin gtk+-2.0 >= 2.6.0") 2>&5 ++ ac_status=$? ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ (exit $ac_status); }; then ++ pkg_cv_DESKTOP_FILE_PLUGIN_DEP_CFLAGS=`$PKG_CONFIG --cflags "${gecko_cv_gecko} mozilla-plugin gtk+-2.0 >= 2.6.0" 2>/dev/null` ++else ++ pkg_failed=yes ++fi ++ fi ++else ++ pkg_failed=untried ++fi ++if test -n "$PKG_CONFIG"; then ++ if test -n "$DESKTOP_FILE_PLUGIN_DEP_LIBS"; then ++ pkg_cv_DESKTOP_FILE_PLUGIN_DEP_LIBS="$DESKTOP_FILE_PLUGIN_DEP_LIBS" ++ else ++ if test -n "$PKG_CONFIG" && \ ++ { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"\${gecko_cv_gecko} mozilla-plugin gtk+-2.0 >= 2.6.0\"") >&5 ++ ($PKG_CONFIG --exists --print-errors "${gecko_cv_gecko} mozilla-plugin gtk+-2.0 >= 2.6.0") 2>&5 ++ ac_status=$? ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ (exit $ac_status); }; then ++ pkg_cv_DESKTOP_FILE_PLUGIN_DEP_LIBS=`$PKG_CONFIG --libs "${gecko_cv_gecko} mozilla-plugin gtk+-2.0 >= 2.6.0" 2>/dev/null` ++else ++ pkg_failed=yes ++fi ++ fi ++else ++ pkg_failed=untried ++fi ++ ++ ++ ++if test $pkg_failed = yes; then ++ ++if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then ++ _pkg_short_errors_supported=yes ++else ++ _pkg_short_errors_supported=no ++fi ++ if test $_pkg_short_errors_supported = yes; then ++ DESKTOP_FILE_PLUGIN_DEP_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "${gecko_cv_gecko} mozilla-plugin gtk+-2.0 >= 2.6.0"` ++ else ++ DESKTOP_FILE_PLUGIN_DEP_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "${gecko_cv_gecko} mozilla-plugin gtk+-2.0 >= 2.6.0"` ++ fi ++ # Put the nasty error message in config.log where it belongs ++ echo "$DESKTOP_FILE_PLUGIN_DEP_PKG_ERRORS" >&5 ++ ++ { { echo "$as_me:$LINENO: error: Package requirements (${gecko_cv_gecko} mozilla-plugin gtk+-2.0 >= 2.6.0) were not met: ++ ++$DESKTOP_FILE_PLUGIN_DEP_PKG_ERRORS ++ ++Consider adjusting the PKG_CONFIG_PATH environment variable if you ++installed software in a non-standard prefix. ++ ++Alternatively, you may set the environment variables DESKTOP_FILE_PLUGIN_DEP_CFLAGS ++and DESKTOP_FILE_PLUGIN_DEP_LIBS to avoid the need to call pkg-config. ++See the pkg-config man page for more details. ++" >&5 ++echo "$as_me: error: Package requirements (${gecko_cv_gecko} mozilla-plugin gtk+-2.0 >= 2.6.0) were not met: ++ ++$DESKTOP_FILE_PLUGIN_DEP_PKG_ERRORS ++ ++Consider adjusting the PKG_CONFIG_PATH environment variable if you ++installed software in a non-standard prefix. ++ ++Alternatively, you may set the environment variables DESKTOP_FILE_PLUGIN_DEP_CFLAGS ++and DESKTOP_FILE_PLUGIN_DEP_LIBS to avoid the need to call pkg-config. ++See the pkg-config man page for more details. ++" >&2;} ++ { (exit 1); exit 1; }; } ++elif test $pkg_failed = untried; then ++ { { echo "$as_me:$LINENO: error: The pkg-config script could not be found or is too old. Make sure it ++is in your PATH or set the PKG_CONFIG environment variable to the full ++path to pkg-config. ++ ++Alternatively, you may set the environment variables DESKTOP_FILE_PLUGIN_DEP_CFLAGS ++and DESKTOP_FILE_PLUGIN_DEP_LIBS to avoid the need to call pkg-config. ++See the pkg-config man page for more details. ++ ++To get pkg-config, see . ++See \`config.log' for more details." >&5 ++echo "$as_me: error: The pkg-config script could not be found or is too old. Make sure it ++is in your PATH or set the PKG_CONFIG environment variable to the full ++path to pkg-config. ++ ++Alternatively, you may set the environment variables DESKTOP_FILE_PLUGIN_DEP_CFLAGS ++and DESKTOP_FILE_PLUGIN_DEP_LIBS to avoid the need to call pkg-config. ++See the pkg-config man page for more details. ++ ++To get pkg-config, see . ++See \`config.log' for more details." >&2;} ++ { (exit 1); exit 1; }; } ++else ++ DESKTOP_FILE_PLUGIN_DEP_CFLAGS=$pkg_cv_DESKTOP_FILE_PLUGIN_DEP_CFLAGS ++ DESKTOP_FILE_PLUGIN_DEP_LIBS=$pkg_cv_DESKTOP_FILE_PLUGIN_DEP_LIBS ++ { echo "$as_me:$LINENO: result: yes" >&5 ++echo "${ECHO_T}yes" >&6; } ++ : ++fi ++ else + + pkg_failed=no + { echo "$as_me:$LINENO: checking for DESKTOP_FILE_PLUGIN_DEP" >&5 + echo $ECHO_N "checking for DESKTOP_FILE_PLUGIN_DEP... $ECHO_C" >&6; } + + if test -n "$PKG_CONFIG"; then + if test -n "$DESKTOP_FILE_PLUGIN_DEP_CFLAGS"; then + pkg_cv_DESKTOP_FILE_PLUGIN_DEP_CFLAGS="$DESKTOP_FILE_PLUGIN_DEP_CFLAGS" +@@ -27880,16 +28479,17 @@ + { (exit 1); exit 1; }; } + else + DESKTOP_FILE_PLUGIN_DEP_CFLAGS=$pkg_cv_DESKTOP_FILE_PLUGIN_DEP_CFLAGS + DESKTOP_FILE_PLUGIN_DEP_LIBS=$pkg_cv_DESKTOP_FILE_PLUGIN_DEP_LIBS + { echo "$as_me:$LINENO: result: yes" >&5 + echo "${ECHO_T}yes" >&6; } + : + fi ++ fi + + + fi + + if test "$enable_desktop_file_plugin" = "yes"; then + + cat >>confdefs.h <<\_ACEOF + #define HAVE_PRIVATE_PLUGINS 1 +@@ -30112,19 +30712,16 @@ + ENABLE_SK_TRUE= + ENABLE_SK_FALSE='#' + else + ENABLE_SK_TRUE='#' + ENABLE_SK_FALSE= + fi + + +-DISTCHECK_CONFIGURE_FLAGS="--disable-scrollkeeper $DISTCHECK_CONFIGURE_FLAGS" +- +- + if test "$gdu_cv_have_gdu" = "yes"; then + HAVE_GNOME_DOC_UTILS_TRUE= + HAVE_GNOME_DOC_UTILS_FALSE='#' + else + HAVE_GNOME_DOC_UTILS_TRUE='#' + HAVE_GNOME_DOC_UTILS_FALSE= + fi + +@@ -30145,83 +30742,81 @@ + # Check whether --enable-gtk-doc was given. + if test "${enable_gtk_doc+set}" = set; then + enableval=$enable_gtk_doc; + else + enable_gtk_doc=no + fi + + +- have_gtk_doc=no + if test x$enable_gtk_doc = xyes; then +- if test -z "$PKG_CONFIG"; then +- # Extract the first word of "pkg-config", so it can be a program name with args. +-set dummy pkg-config; ac_word=$2 ++ if test -n "$PKG_CONFIG" && \ ++ { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"gtk-doc >= 1.0\"") >&5 ++ ($PKG_CONFIG --exists --print-errors "gtk-doc >= 1.0") 2>&5 ++ ac_status=$? ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ (exit $ac_status); }; then ++ : ++else ++ { { echo "$as_me:$LINENO: error: You need to have gtk-doc >= 1.0 installed to build gtk-doc" >&5 ++echo "$as_me: error: You need to have gtk-doc >= 1.0 installed to build gtk-doc" >&2;} ++ { (exit 1); exit 1; }; } ++fi ++ fi ++ ++ { echo "$as_me:$LINENO: checking whether to build gtk-doc documentation" >&5 ++echo $ECHO_N "checking whether to build gtk-doc documentation... $ECHO_C" >&6; } ++ { echo "$as_me:$LINENO: result: $enable_gtk_doc" >&5 ++echo "${ECHO_T}$enable_gtk_doc" >&6; } ++ ++ for ac_prog in gtkdoc-check ++do ++ # Extract the first word of "$ac_prog", so it can be a program name with args. ++set dummy $ac_prog; ac_word=$2 + { echo "$as_me:$LINENO: checking for $ac_word" >&5 + echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } +-if test "${ac_cv_path_PKG_CONFIG+set}" = set; then ++if test "${ac_cv_path_GTKDOC_CHECK+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 + else +- case $PKG_CONFIG in ++ case $GTKDOC_CHECK in + [\\/]* | ?:[\\/]*) +- ac_cv_path_PKG_CONFIG="$PKG_CONFIG" # Let the user override the test with a path. ++ ac_cv_path_GTKDOC_CHECK="$GTKDOC_CHECK" # Let the user override the test with a path. + ;; + *) + as_save_IFS=$IFS; IFS=$PATH_SEPARATOR + for as_dir in $PATH + do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then +- ac_cv_path_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext" ++ ac_cv_path_GTKDOC_CHECK="$as_dir/$ac_word$ac_exec_ext" + echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi + done + done + IFS=$as_save_IFS + +- test -z "$ac_cv_path_PKG_CONFIG" && ac_cv_path_PKG_CONFIG="no" + ;; + esac + fi +-PKG_CONFIG=$ac_cv_path_PKG_CONFIG +-if test -n "$PKG_CONFIG"; then +- { echo "$as_me:$LINENO: result: $PKG_CONFIG" >&5 +-echo "${ECHO_T}$PKG_CONFIG" >&6; } ++GTKDOC_CHECK=$ac_cv_path_GTKDOC_CHECK ++if test -n "$GTKDOC_CHECK"; then ++ { echo "$as_me:$LINENO: result: $GTKDOC_CHECK" >&5 ++echo "${ECHO_T}$GTKDOC_CHECK" >&6; } + else + { echo "$as_me:$LINENO: result: no" >&5 + echo "${ECHO_T}no" >&6; } + fi + + +- fi +- if test "$PKG_CONFIG" != "no" && $PKG_CONFIG --exists gtk-doc; then +- have_gtk_doc=yes +- fi +- +- gtk_doc_min_version=1.0 +- if test "$have_gtk_doc" = yes; then +- { echo "$as_me:$LINENO: checking gtk-doc version >= $gtk_doc_min_version" >&5 +-echo $ECHO_N "checking gtk-doc version >= $gtk_doc_min_version... $ECHO_C" >&6; } +- if $PKG_CONFIG --atleast-version $gtk_doc_min_version gtk-doc; then +- { echo "$as_me:$LINENO: result: yes" >&5 +-echo "${ECHO_T}yes" >&6; } +- else +- { echo "$as_me:$LINENO: result: no" >&5 +-echo "${ECHO_T}no" >&6; } +- have_gtk_doc=no +- fi +- fi ++ test -n "$GTKDOC_CHECK" && break ++done + +- if test "$have_gtk_doc" != yes; then +- enable_gtk_doc=no +- fi +- fi + + if test x$enable_gtk_doc = xyes; then + ENABLE_GTK_DOC_TRUE= + ENABLE_GTK_DOC_FALSE='#' + else + ENABLE_GTK_DOC_TRUE='#' + ENABLE_GTK_DOC_FALSE= + fi +@@ -31043,16 +31638,30 @@ + + if test -z "${GCONF_SCHEMAS_INSTALL_TRUE}" && test -z "${GCONF_SCHEMAS_INSTALL_FALSE}"; then + { { echo "$as_me:$LINENO: error: conditional \"GCONF_SCHEMAS_INSTALL\" was never defined. + Usually this means the macro was only invoked conditionally." >&5 + echo "$as_me: error: conditional \"GCONF_SCHEMAS_INSTALL\" was never defined. + Usually this means the macro was only invoked conditionally." >&2;} + { (exit 1); exit 1; }; } + fi ++if test -z "${HAVE_GECKO_DEBUG_TRUE}" && test -z "${HAVE_GECKO_DEBUG_FALSE}"; then ++ { { echo "$as_me:$LINENO: error: conditional \"HAVE_GECKO_DEBUG\" was never defined. ++Usually this means the macro was only invoked conditionally." >&5 ++echo "$as_me: error: conditional \"HAVE_GECKO_DEBUG\" was never defined. ++Usually this means the macro was only invoked conditionally." >&2;} ++ { (exit 1); exit 1; }; } ++fi ++if test -z "${HAVE_GECKO_XPCOM_GLUE_TRUE}" && test -z "${HAVE_GECKO_XPCOM_GLUE_FALSE}"; then ++ { { echo "$as_me:$LINENO: error: conditional \"HAVE_GECKO_XPCOM_GLUE\" was never defined. ++Usually this means the macro was only invoked conditionally." >&5 ++echo "$as_me: error: conditional \"HAVE_GECKO_XPCOM_GLUE\" was never defined. ++Usually this means the macro was only invoked conditionally." >&2;} ++ { (exit 1); exit 1; }; } ++fi + if test -z "${HAVE_MOZILLA_TOOLKIT_TRUE}" && test -z "${HAVE_MOZILLA_TOOLKIT_FALSE}"; then + { { echo "$as_me:$LINENO: error: conditional \"HAVE_MOZILLA_TOOLKIT\" was never defined. + Usually this means the macro was only invoked conditionally." >&5 + echo "$as_me: error: conditional \"HAVE_MOZILLA_TOOLKIT\" was never defined. + Usually this means the macro was only invoked conditionally." >&2;} + { (exit 1); exit 1; }; } + fi + if test -z "${HAVE_GECKO_DEBUG_TRUE}" && test -z "${HAVE_GECKO_DEBUG_FALSE}"; then +@@ -31085,16 +31694,23 @@ + fi + if test -z "${HAVE_GECKO_1_9_TRUE}" && test -z "${HAVE_GECKO_1_9_FALSE}"; then + { { echo "$as_me:$LINENO: error: conditional \"HAVE_GECKO_1_9\" was never defined. + Usually this means the macro was only invoked conditionally." >&5 + echo "$as_me: error: conditional \"HAVE_GECKO_1_9\" was never defined. + Usually this means the macro was only invoked conditionally." >&2;} + { (exit 1); exit 1; }; } + fi ++if test -z "${HAVE_GECKO_HOME_TRUE}" && test -z "${HAVE_GECKO_HOME_FALSE}"; then ++ { { echo "$as_me:$LINENO: error: conditional \"HAVE_GECKO_HOME\" was never defined. ++Usually this means the macro was only invoked conditionally." >&5 ++echo "$as_me: error: conditional \"HAVE_GECKO_HOME\" was never defined. ++Usually this means the macro was only invoked conditionally." >&2;} ++ { (exit 1); exit 1; }; } ++fi + if test -z "${WITH_GECKO_ENGINE_TRUE}" && test -z "${WITH_GECKO_ENGINE_FALSE}"; then + { { echo "$as_me:$LINENO: error: conditional \"WITH_GECKO_ENGINE\" was never defined. + Usually this means the macro was only invoked conditionally." >&5 + echo "$as_me: error: conditional \"WITH_GECKO_ENGINE\" was never defined. + Usually this means the macro was only invoked conditionally." >&2;} + { (exit 1); exit 1; }; } + fi + if test -z "${HAVE_XULRUNNER_TRUE}" && test -z "${HAVE_XULRUNNER_FALSE}"; then +@@ -31962,16 +32578,19 @@ + INTLTOOL_KBD_RULE!$INTLTOOL_KBD_RULE$ac_delim + INTLTOOL_XML_RULE!$INTLTOOL_XML_RULE$ac_delim + INTLTOOL_XML_NOMERGE_RULE!$INTLTOOL_XML_NOMERGE_RULE$ac_delim + INTLTOOL_CAVES_RULE!$INTLTOOL_CAVES_RULE$ac_delim + INTLTOOL_SCHEMAS_RULE!$INTLTOOL_SCHEMAS_RULE$ac_delim + INTLTOOL_THEME_RULE!$INTLTOOL_THEME_RULE$ac_delim + INTLTOOL_SERVICE_RULE!$INTLTOOL_SERVICE_RULE$ac_delim + INTLTOOL_POLICY_RULE!$INTLTOOL_POLICY_RULE$ac_delim ++XGETTEXT!$XGETTEXT$ac_delim ++MSGMERGE!$MSGMERGE$ac_delim ++MSGFMT!$MSGFMT$ac_delim + INTLTOOL_EXTRACT!$INTLTOOL_EXTRACT$ac_delim + INTLTOOL_MERGE!$INTLTOOL_MERGE$ac_delim + INTLTOOL_UPDATE!$INTLTOOL_UPDATE$ac_delim + INTLTOOL_PERL!$INTLTOOL_PERL$ac_delim + ALL_LINGUAS!$ALL_LINGUAS$ac_delim + DATADIRNAME!$DATADIRNAME$ac_delim + PKG_CONFIG!$PKG_CONFIG$ac_delim + WARN_CFLAGS!$WARN_CFLAGS$ac_delim +@@ -31983,58 +32602,55 @@ + DBUS_LIBS!$DBUS_LIBS$ac_delim + DBUS_BINDING_TOOL!$DBUS_BINDING_TOOL$ac_delim + GCONF_SCHEMA_CONFIG_SOURCE!$GCONF_SCHEMA_CONFIG_SOURCE$ac_delim + GCONF_SCHEMA_FILE_DIR!$GCONF_SCHEMA_FILE_DIR$ac_delim + GCONF_SCHEMAS_INSTALL_TRUE!$GCONF_SCHEMAS_INSTALL_TRUE$ac_delim + GCONF_SCHEMAS_INSTALL_FALSE!$GCONF_SCHEMAS_INSTALL_FALSE$ac_delim + GCONFTOOL!$GCONFTOOL$ac_delim + with_engine!$with_engine$ac_delim ++HAVE_GECKO_DEBUG_TRUE!$HAVE_GECKO_DEBUG_TRUE$ac_delim ++HAVE_GECKO_DEBUG_FALSE!$HAVE_GECKO_DEBUG_FALSE$ac_delim ++HAVE_GECKO_XPCOM_GLUE_TRUE!$HAVE_GECKO_XPCOM_GLUE_TRUE$ac_delim ++HAVE_GECKO_XPCOM_GLUE_FALSE!$HAVE_GECKO_XPCOM_GLUE_FALSE$ac_delim + GECKO!$GECKO$ac_delim + GECKO_FLAVOUR!$GECKO_FLAVOUR$ac_delim + GECKO_INCLUDE_ROOT!$GECKO_INCLUDE_ROOT$ac_delim + GECKO_HOME!$GECKO_HOME$ac_delim + GECKO_PREFIX!$GECKO_PREFIX$ac_delim + GECKO_EXTRA_LIBS!$GECKO_EXTRA_LIBS$ac_delim + GECKO_GLUE_LIBS!$GECKO_GLUE_LIBS$ac_delim + GECKO_CFLAGS!$GECKO_CFLAGS$ac_delim + GECKO_LIBS!$GECKO_LIBS$ac_delim + WEASEL_UA_VERSION!$WEASEL_UA_VERSION$ac_delim + HAVE_MOZILLA_TOOLKIT_TRUE!$HAVE_MOZILLA_TOOLKIT_TRUE$ac_delim + HAVE_MOZILLA_TOOLKIT_FALSE!$HAVE_MOZILLA_TOOLKIT_FALSE$ac_delim +-HAVE_GECKO_DEBUG_TRUE!$HAVE_GECKO_DEBUG_TRUE$ac_delim +-HAVE_GECKO_DEBUG_FALSE!$HAVE_GECKO_DEBUG_FALSE$ac_delim + HAVE_GECKO_1_7_TRUE!$HAVE_GECKO_1_7_TRUE$ac_delim + HAVE_GECKO_1_7_FALSE!$HAVE_GECKO_1_7_FALSE$ac_delim + HAVE_GECKO_1_8_TRUE!$HAVE_GECKO_1_8_TRUE$ac_delim + HAVE_GECKO_1_8_FALSE!$HAVE_GECKO_1_8_FALSE$ac_delim + HAVE_GECKO_1_8_1_TRUE!$HAVE_GECKO_1_8_1_TRUE$ac_delim + HAVE_GECKO_1_8_1_FALSE!$HAVE_GECKO_1_8_1_FALSE$ac_delim + HAVE_GECKO_1_9_TRUE!$HAVE_GECKO_1_9_TRUE$ac_delim + HAVE_GECKO_1_9_FALSE!$HAVE_GECKO_1_9_FALSE$ac_delim ++HAVE_GECKO_HOME_TRUE!$HAVE_GECKO_HOME_TRUE$ac_delim ++HAVE_GECKO_HOME_FALSE!$HAVE_GECKO_HOME_FALSE$ac_delim + WITH_GECKO_ENGINE_TRUE!$WITH_GECKO_ENGINE_TRUE$ac_delim + WITH_GECKO_ENGINE_FALSE!$WITH_GECKO_ENGINE_FALSE$ac_delim + HAVE_XULRUNNER_TRUE!$HAVE_XULRUNNER_TRUE$ac_delim + HAVE_XULRUNNER_FALSE!$HAVE_XULRUNNER_FALSE$ac_delim + HAVE_MOZILLA_PSM_TRUE!$HAVE_MOZILLA_PSM_TRUE$ac_delim + HAVE_MOZILLA_PSM_FALSE!$HAVE_MOZILLA_PSM_FALSE$ac_delim + ENABLE_FILEPICKER_TRUE!$ENABLE_FILEPICKER_TRUE$ac_delim + ENABLE_FILEPICKER_FALSE!$ENABLE_FILEPICKER_FALSE$ac_delim + LIBXUL_VERSION!$LIBXUL_VERSION$ac_delim + LIBXUL_PREFIX!$LIBXUL_PREFIX$ac_delim + LIBXUL_INCLUDE_ROOT!$LIBXUL_INCLUDE_ROOT$ac_delim + LIBXUL_INCLUDES!$LIBXUL_INCLUDES$ac_delim + LIBXUL_LIBDIR!$LIBXUL_LIBDIR$ac_delim +-LIBXUL_CXXCPPFLAGS!$LIBXUL_CXXCPPFLAGS$ac_delim +-LIBXUL_CXXFLAGS!$LIBXUL_CXXFLAGS$ac_delim +-LIBXUL_LDFLAGS!$LIBXUL_LDFLAGS$ac_delim +-LIBXUL_LIBS!$LIBXUL_LIBS$ac_delim +-HAVE_LIBXUL_TRUE!$HAVE_LIBXUL_TRUE$ac_delim +-HAVE_LIBXUL_FALSE!$HAVE_LIBXUL_FALSE$ac_delim +-HAVE_LIBXUL_DEBUG_TRUE!$HAVE_LIBXUL_DEBUG_TRUE$ac_delim + _ACEOF + + if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 97; then + break + elif $ac_last_try; then + { { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5 + echo "$as_me: error: could not make $CONFIG_STATUS" >&2;} + { (exit 1); exit 1; }; } +@@ -32066,16 +32682,23 @@ + cat >>$CONFIG_STATUS <<_ACEOF + CEOF$ac_eof + _ACEOF + + + ac_delim='%!_!# ' + for ac_last_try in false false false false false :; do + cat >conf$$subs.sed <<_ACEOF ++LIBXUL_CXXCPPFLAGS!$LIBXUL_CXXCPPFLAGS$ac_delim ++LIBXUL_CXXFLAGS!$LIBXUL_CXXFLAGS$ac_delim ++LIBXUL_LDFLAGS!$LIBXUL_LDFLAGS$ac_delim ++LIBXUL_LIBS!$LIBXUL_LIBS$ac_delim ++HAVE_LIBXUL_TRUE!$HAVE_LIBXUL_TRUE$ac_delim ++HAVE_LIBXUL_FALSE!$HAVE_LIBXUL_FALSE$ac_delim ++HAVE_LIBXUL_DEBUG_TRUE!$HAVE_LIBXUL_DEBUG_TRUE$ac_delim + HAVE_LIBXUL_DEBUG_FALSE!$HAVE_LIBXUL_DEBUG_FALSE$ac_delim + WITH_XULRUNNER_ENGINE_TRUE!$WITH_XULRUNNER_ENGINE_TRUE$ac_delim + WITH_XULRUNNER_ENGINE_FALSE!$WITH_XULRUNNER_ENGINE_FALSE$ac_delim + WEBKIT_CFLAGS!$WEBKIT_CFLAGS$ac_delim + WEBKIT_LIBS!$WEBKIT_LIBS$ac_delim + WITH_WEBKIT_ENGINE_TRUE!$WITH_WEBKIT_ENGINE_TRUE$ac_delim + WITH_WEBKIT_ENGINE_FALSE!$WITH_WEBKIT_ENGINE_FALSE$ac_delim + PYTHON!$PYTHON$ac_delim +@@ -32118,39 +32741,37 @@ + ENABLE_SPELLCHECKER_TRUE!$ENABLE_SPELLCHECKER_TRUE$ac_delim + ENABLE_SPELLCHECKER_FALSE!$ENABLE_SPELLCHECKER_FALSE$ac_delim + AM_CPPFLAGS!$AM_CPPFLAGS$ac_delim + AM_CFLAGS!$AM_CFLAGS$ac_delim + AM_CXXFLAGS!$AM_CXXFLAGS$ac_delim + AM_LDFLAGS!$AM_LDFLAGS$ac_delim + GETTEXT_PACKAGE!$GETTEXT_PACKAGE$ac_delim + USE_NLS!$USE_NLS$ac_delim +-MSGFMT!$MSGFMT$ac_delim + MSGFMT_OPTS!$MSGFMT_OPTS$ac_delim + GMSGFMT!$GMSGFMT$ac_delim +-XGETTEXT!$XGETTEXT$ac_delim + CATALOGS!$CATALOGS$ac_delim + CATOBJEXT!$CATOBJEXT$ac_delim + GMOFILES!$GMOFILES$ac_delim + INSTOBJEXT!$INSTOBJEXT$ac_delim + INTLLIBS!$INTLLIBS$ac_delim + PO_IN_DATADIR_TRUE!$PO_IN_DATADIR_TRUE$ac_delim + PO_IN_DATADIR_FALSE!$PO_IN_DATADIR_FALSE$ac_delim + POFILES!$POFILES$ac_delim + POSUB!$POSUB$ac_delim + MKINSTALLDIRS!$MKINSTALLDIRS$ac_delim + HELP_DIR!$HELP_DIR$ac_delim + OMF_DIR!$OMF_DIR$ac_delim + DOC_USER_FORMATS!$DOC_USER_FORMATS$ac_delim + ENABLE_SK_TRUE!$ENABLE_SK_TRUE$ac_delim + ENABLE_SK_FALSE!$ENABLE_SK_FALSE$ac_delim +-DISTCHECK_CONFIGURE_FLAGS!$DISTCHECK_CONFIGURE_FLAGS$ac_delim + HAVE_GNOME_DOC_UTILS_TRUE!$HAVE_GNOME_DOC_UTILS_TRUE$ac_delim + HAVE_GNOME_DOC_UTILS_FALSE!$HAVE_GNOME_DOC_UTILS_FALSE$ac_delim + HTML_DIR!$HTML_DIR$ac_delim ++GTKDOC_CHECK!$GTKDOC_CHECK$ac_delim + ENABLE_GTK_DOC_TRUE!$ENABLE_GTK_DOC_TRUE$ac_delim + ENABLE_GTK_DOC_FALSE!$ENABLE_GTK_DOC_FALSE$ac_delim + GTK_DOC_USE_LIBTOOL_TRUE!$GTK_DOC_USE_LIBTOOL_TRUE$ac_delim + GTK_DOC_USE_LIBTOOL_FALSE!$GTK_DOC_USE_LIBTOOL_FALSE$ac_delim + SVN_ROOT!$SVN_ROOT$ac_delim + SVN_MODULE!$SVN_MODULE$ac_delim + SVN_BRANCH!$SVN_BRANCH$ac_delim + GTK_CFLAGS!$GTK_CFLAGS$ac_delim +@@ -32158,24 +32779,65 @@ + GTKPRINT_CFLAGS!$GTKPRINT_CFLAGS$ac_delim + GTKPRINT_LIBS!$GTKPRINT_LIBS$ac_delim + GCONF_CFLAGS!$GCONF_CFLAGS$ac_delim + GCONF_LIBS!$GCONF_LIBS$ac_delim + GLADE_CFLAGS!$GLADE_CFLAGS$ac_delim + GLADE_LIBS!$GLADE_LIBS$ac_delim + GNOME_CFLAGS!$GNOME_CFLAGS$ac_delim + GNOME_LIBS!$GNOME_LIBS$ac_delim ++_ACEOF ++ ++ if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 97; then ++ break ++ elif $ac_last_try; then ++ { { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5 ++echo "$as_me: error: could not make $CONFIG_STATUS" >&2;} ++ { (exit 1); exit 1; }; } ++ else ++ ac_delim="$ac_delim!$ac_delim _$ac_delim!! " ++ fi ++done ++ ++ac_eof=`sed -n '/^CEOF[0-9]*$/s/CEOF/0/p' conf$$subs.sed` ++if test -n "$ac_eof"; then ++ ac_eof=`echo "$ac_eof" | sort -nru | sed 1q` ++ ac_eof=`expr $ac_eof + 1` ++fi ++ ++cat >>$CONFIG_STATUS <<_ACEOF ++cat >"\$tmp/subs-3.sed" <<\CEOF$ac_eof ++/@[a-zA-Z_][a-zA-Z_0-9]*@/!b ++_ACEOF ++sed ' ++s/[,\\&]/\\&/g; s/@/@|#_!!_#|/g ++s/^/s,@/; s/!/@,|#_!!_#|/ ++:n ++t n ++s/'"$ac_delim"'$/,g/; t ++s/$/\\/; p ++N; s/^.*\n//; s/[,\\&]/\\&/g; s/@/@|#_!!_#|/g; b n ++' >>$CONFIG_STATUS >$CONFIG_STATUS <<_ACEOF ++CEOF$ac_eof ++_ACEOF ++ ++ ++ac_delim='%!_!# ' ++for ac_last_try in false false false false false :; do ++ cat >conf$$subs.sed <<_ACEOF + LSB_RELEASE!$LSB_RELEASE$ac_delim + GGE_VERSION!$GGE_VERSION$ac_delim + GGE_API_VERSION!$GGE_API_VERSION$ac_delim + LIBOBJS!$LIBOBJS$ac_delim + LTLIBOBJS!$LTLIBOBJS$ac_delim + _ACEOF + +- if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 97; then ++ if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 5; then + break + elif $ac_last_try; then + { { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5 + echo "$as_me: error: could not make $CONFIG_STATUS" >&2;} + { (exit 1); exit 1; }; } + else + ac_delim="$ac_delim!$ac_delim _$ac_delim!! " + fi +@@ -32183,30 +32845,32 @@ + + ac_eof=`sed -n '/^CEOF[0-9]*$/s/CEOF/0/p' conf$$subs.sed` + if test -n "$ac_eof"; then + ac_eof=`echo "$ac_eof" | sort -nru | sed 1q` + ac_eof=`expr $ac_eof + 1` + fi + + cat >>$CONFIG_STATUS <<_ACEOF +-cat >"\$tmp/subs-3.sed" <<\CEOF$ac_eof +-/@[a-zA-Z_][a-zA-Z_0-9]*@/!b ++cat >"\$tmp/subs-4.sed" <<\CEOF$ac_eof ++/@[a-zA-Z_][a-zA-Z_0-9]*@/!b end + _ACEOF + sed ' + s/[,\\&]/\\&/g; s/@/@|#_!!_#|/g + s/^/s,@/; s/!/@,|#_!!_#|/ + :n + t n + s/'"$ac_delim"'$/,g/; t + s/$/\\/; p + N; s/^.*\n//; s/[,\\&]/\\&/g; s/@/@|#_!!_#|/g; b n + ' >>$CONFIG_STATUS >$CONFIG_STATUS <<_ACEOF ++:end ++s/|#_!!_#|//g + CEOF$ac_eof + _ACEOF + + + # VPATH may cause trouble with some makes, so we remove $(srcdir), + # ${srcdir} and @srcdir@ from VPATH if srcdir is ".", strip leading and + # trailing colons and then remove the whole line if VPATH becomes empty + # (actually we leave an empty line to preserve line numbers). +@@ -32450,17 +33114,17 @@ + s&@top_srcdir@&$ac_top_srcdir&;t t + s&@abs_top_srcdir@&$ac_abs_top_srcdir&;t t + s&@builddir@&$ac_builddir&;t t + s&@abs_builddir@&$ac_abs_builddir&;t t + s&@abs_top_builddir@&$ac_abs_top_builddir&;t t + s&@INSTALL@&$ac_INSTALL&;t t + s&@MKDIR_P@&$ac_MKDIR_P&;t t + $ac_datarootdir_hack +-" $ac_file_inputs | sed -f "$tmp/subs-1.sed" | sed -f "$tmp/subs-2.sed" | sed -f "$tmp/subs-3.sed" | sed 's/|#_!!_#|//g' >$tmp/out ++" $ac_file_inputs | sed -f "$tmp/subs-1.sed" | sed -f "$tmp/subs-2.sed" | sed -f "$tmp/subs-3.sed" | sed -f "$tmp/subs-4.sed" >$tmp/out + + test -z "$ac_datarootdir_hack$ac_datarootdir_seen" && + { ac_out=`sed -n '/\${datarootdir}/p' "$tmp/out"`; test -n "$ac_out"; } && + { ac_out=`sed -n '/^[ ]*datarootdir[ ]*:*=/p' "$tmp/out"`; test -z "$ac_out"; } && + { echo "$as_me:$LINENO: WARNING: $ac_file contains a reference to the variable \`datarootdir' + which seems to be undefined. Please make sure it is defined." >&5 + echo "$as_me: WARNING: $ac_file contains a reference to the variable \`datarootdir' + which seems to be undefined. Please make sure it is defined." >&2;} +Index: epiphany-browser-2.21.90/doc/reference/Makefile.in +=================================================================== +--- epiphany-browser-2.21.90.orig/doc/reference/Makefile.in ++++ epiphany-browser-2.21.90/doc/reference/Makefile.in +@@ -97,17 +97,16 @@ + DBUS_LIBS = @DBUS_LIBS@ + DEFS = @DEFS@ + DEPDIR = @DEPDIR@ + DEPENDENCIES_CFLAGS = @DEPENDENCIES_CFLAGS@ + DEPENDENCIES_LIBS = @DEPENDENCIES_LIBS@ + DESKTOP_FILE_PLUGIN_DEP_CFLAGS = @DESKTOP_FILE_PLUGIN_DEP_CFLAGS@ + DESKTOP_FILE_PLUGIN_DEP_LIBS = @DESKTOP_FILE_PLUGIN_DEP_LIBS@ + DISABLE_DEPRECATED = @DISABLE_DEPRECATED@ +-DISTCHECK_CONFIGURE_FLAGS = @DISTCHECK_CONFIGURE_FLAGS@ + DOC_USER_FORMATS = @DOC_USER_FORMATS@ + ECHO = @ECHO@ + ECHO_C = @ECHO_C@ + ECHO_N = @ECHO_N@ + ECHO_T = @ECHO_T@ + EGREP = @EGREP@ + EPIPHANY_API_VERSION = @EPIPHANY_API_VERSION@ + EPIPHANY_FEATURES = @EPIPHANY_FEATURES@ +@@ -137,16 +136,17 @@ + GLADE_LIBS = @GLADE_LIBS@ + GLIB_GENMARSHAL = @GLIB_GENMARSHAL@ + GLIB_MKENUMS = @GLIB_MKENUMS@ + GMOFILES = @GMOFILES@ + GMSGFMT = @GMSGFMT@ + GNOME_CFLAGS = @GNOME_CFLAGS@ + GNOME_LIBS = @GNOME_LIBS@ + GREP = @GREP@ ++GTKDOC_CHECK = @GTKDOC_CHECK@ + GTKPRINT_CFLAGS = @GTKPRINT_CFLAGS@ + GTKPRINT_LIBS = @GTKPRINT_LIBS@ + GTK_CFLAGS = @GTK_CFLAGS@ + GTK_LIBS = @GTK_LIBS@ + HELP_DIR = @HELP_DIR@ + HTML_DIR = @HTML_DIR@ + INSTALL = @INSTALL@ + INSTALL_DATA = @INSTALL_DATA@ +@@ -195,16 +195,17 @@ + LSB_RELEASE = @LSB_RELEASE@ + LTLIBOBJS = @LTLIBOBJS@ + MAINT = @MAINT@ + MAKEINFO = @MAKEINFO@ + MKDIR_P = @MKDIR_P@ + MKINSTALLDIRS = @MKINSTALLDIRS@ + MSGFMT = @MSGFMT@ + MSGFMT_OPTS = @MSGFMT_OPTS@ ++MSGMERGE = @MSGMERGE@ + NO_STRICT_ALIASING_CFLAGS = @NO_STRICT_ALIASING_CFLAGS@ + OBJEXT = @OBJEXT@ + OMF_DIR = @OMF_DIR@ + PACKAGE = @PACKAGE@ + PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ + PACKAGE_NAME = @PACKAGE_NAME@ + PACKAGE_STRING = @PACKAGE_STRING@ + PACKAGE_TARNAME = @PACKAGE_TARNAME@ +@@ -467,18 +468,18 @@ + # $(DOC_MODULE)-overrides.txt file and uncomment the second line here. + DOC_OVERRIDES = + @GTK_DOC_USE_LIBTOOL_FALSE@GTKDOC_CC = $(CC) $(INCLUDES) $(AM_CFLAGS) $(CFLAGS) + + # include common portion ... + # include $(top_srcdir)/gtk-doc.make + # We need to copy/paste this to be able to change LD_LIBRARY_PATH + @GTK_DOC_USE_LIBTOOL_TRUE@GTKDOC_CC = $(LIBTOOL) --mode=compile $(CC) $(INCLUDES) $(AM_CFLAGS) $(CFLAGS) +-@GTK_DOC_USE_LIBTOOL_FALSE@GTKDOC_LD = $(CC) $(AM_CFLAGS) $(CFLAGS) $(LDFLAGS) +-@GTK_DOC_USE_LIBTOOL_TRUE@GTKDOC_LD = $(LIBTOOL) --mode=link $(CC) $(AM_CFLAGS) $(CFLAGS) $(LDFLAGS) ++@GTK_DOC_USE_LIBTOOL_FALSE@GTKDOC_LD = $(CXX) $(AM_CFLAGS) $(CFLAGS) $(LDFLAGS) ++@GTK_DOC_USE_LIBTOOL_TRUE@GTKDOC_LD = $(LIBTOOL) --mode=link $(CXX) $(AM_CFLAGS) $(CFLAGS) $(LDFLAGS) + + # We set GPATH here; this gives us semantics for GNU make + # which are more like other make's VPATH, when it comes to + # whether a source that is a target of one rule is then + # searched for in VPATH/GPATH. + # + GPATH = $(srcdir) + TARGET_DIR = $(HTML_DIR)/$(DOC_MODULE) +Index: epiphany-browser-2.21.90/embed/Makefile.in +=================================================================== +--- epiphany-browser-2.21.90.orig/embed/Makefile.in ++++ epiphany-browser-2.21.90/embed/Makefile.in +@@ -197,17 +197,16 @@ + DBUS_LIBS = @DBUS_LIBS@ + DEFS = @DEFS@ + DEPDIR = @DEPDIR@ + DEPENDENCIES_CFLAGS = @DEPENDENCIES_CFLAGS@ + DEPENDENCIES_LIBS = @DEPENDENCIES_LIBS@ + DESKTOP_FILE_PLUGIN_DEP_CFLAGS = @DESKTOP_FILE_PLUGIN_DEP_CFLAGS@ + DESKTOP_FILE_PLUGIN_DEP_LIBS = @DESKTOP_FILE_PLUGIN_DEP_LIBS@ + DISABLE_DEPRECATED = @DISABLE_DEPRECATED@ +-DISTCHECK_CONFIGURE_FLAGS = @DISTCHECK_CONFIGURE_FLAGS@ + DOC_USER_FORMATS = @DOC_USER_FORMATS@ + ECHO = @ECHO@ + ECHO_C = @ECHO_C@ + ECHO_N = @ECHO_N@ + ECHO_T = @ECHO_T@ + EGREP = @EGREP@ + EPIPHANY_API_VERSION = @EPIPHANY_API_VERSION@ + EPIPHANY_FEATURES = @EPIPHANY_FEATURES@ +@@ -237,16 +236,17 @@ + GLADE_LIBS = @GLADE_LIBS@ + GLIB_GENMARSHAL = @GLIB_GENMARSHAL@ + GLIB_MKENUMS = @GLIB_MKENUMS@ + GMOFILES = @GMOFILES@ + GMSGFMT = @GMSGFMT@ + GNOME_CFLAGS = @GNOME_CFLAGS@ + GNOME_LIBS = @GNOME_LIBS@ + GREP = @GREP@ ++GTKDOC_CHECK = @GTKDOC_CHECK@ + GTKPRINT_CFLAGS = @GTKPRINT_CFLAGS@ + GTKPRINT_LIBS = @GTKPRINT_LIBS@ + GTK_CFLAGS = @GTK_CFLAGS@ + GTK_LIBS = @GTK_LIBS@ + HELP_DIR = @HELP_DIR@ + HTML_DIR = @HTML_DIR@ + INSTALL = @INSTALL@ + INSTALL_DATA = @INSTALL_DATA@ +@@ -295,16 +295,17 @@ + LSB_RELEASE = @LSB_RELEASE@ + LTLIBOBJS = @LTLIBOBJS@ + MAINT = @MAINT@ + MAKEINFO = @MAKEINFO@ + MKDIR_P = @MKDIR_P@ + MKINSTALLDIRS = @MKINSTALLDIRS@ + MSGFMT = @MSGFMT@ + MSGFMT_OPTS = @MSGFMT_OPTS@ ++MSGMERGE = @MSGMERGE@ + NO_STRICT_ALIASING_CFLAGS = @NO_STRICT_ALIASING_CFLAGS@ + OBJEXT = @OBJEXT@ + OMF_DIR = @OMF_DIR@ + PACKAGE = @PACKAGE@ + PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ + PACKAGE_NAME = @PACKAGE_NAME@ + PACKAGE_STRING = @PACKAGE_STRING@ + PACKAGE_TARNAME = @PACKAGE_TARNAME@ +@@ -459,16 +460,17 @@ + libephyembedfactory_la_SOURCES = \ + ephy-embed-factory.c \ + ephy-embed-factory.h + + libephyembedfactory_la_CPPFLAGS = \ + -I$(top_srcdir)/embed/$(with_engine) $(AM_CPPFLAGS) \ + $(am__append_3) $(am__append_4) + libephyembedfactory_la_CFLAGS = \ ++ $(GECKO_CFLAGS) \ + $(DEPENDENCIES_CFLAGS) \ + $(AM_CFLAGS) + + CLEANFILES = $(stamp_files) $(BUILT_SOURCES) + DISTCLEANFILES = $(stamp_files) $(BUILT_SOURCES) + MAINTAINERCLEANFILES = $(stamp_files) $(BUILT_SOURCES) + stamp_files = \ + stamp-ephy-embed-type-builtins.c \ +Index: epiphany-browser-2.21.90/embed/mozilla/Makefile.in +=================================================================== +--- epiphany-browser-2.21.90.orig/embed/mozilla/Makefile.in ++++ epiphany-browser-2.21.90/embed/mozilla/Makefile.in +@@ -54,16 +54,19 @@ + @ENABLE_CERTIFICATE_MANAGER_TRUE@am__append_4 = \ + @ENABLE_CERTIFICATE_MANAGER_TRUE@ mozilla-x509-cert.cpp \ + @ENABLE_CERTIFICATE_MANAGER_TRUE@ mozilla-x509-cert.h + + @ENABLE_SPELLCHECKER_TRUE@am__append_5 = \ + @ENABLE_SPELLCHECKER_TRUE@ GeckoSpellCheckEngine.cpp \ + @ENABLE_SPELLCHECKER_TRUE@ GeckoSpellCheckEngine.h + ++@HAVE_GECKO_1_9_TRUE@@HAVE_GECKO_XPCOM_GLUE_TRUE@am__append_6 = \ ++@HAVE_GECKO_1_9_TRUE@@HAVE_GECKO_XPCOM_GLUE_TRUE@ -DXPCOM_GLUE_USE_NSPR ++ + subdir = embed/mozilla + DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in + ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 + am__aclocal_m4_deps = $(top_srcdir)/m4/gecko.m4 \ + $(top_srcdir)/m4/gnome-doc-utils.m4 \ + $(top_srcdir)/m4/gtk-doc.m4 $(top_srcdir)/m4/intltool.m4 \ + $(top_srcdir)/m4/libxul.m4 $(top_srcdir)/m4/python.m4 \ + $(top_srcdir)/configure.ac +@@ -215,17 +218,16 @@ + DBUS_LIBS = @DBUS_LIBS@ + DEFS = @DEFS@ + DEPDIR = @DEPDIR@ + DEPENDENCIES_CFLAGS = @DEPENDENCIES_CFLAGS@ + DEPENDENCIES_LIBS = @DEPENDENCIES_LIBS@ + DESKTOP_FILE_PLUGIN_DEP_CFLAGS = @DESKTOP_FILE_PLUGIN_DEP_CFLAGS@ + DESKTOP_FILE_PLUGIN_DEP_LIBS = @DESKTOP_FILE_PLUGIN_DEP_LIBS@ + DISABLE_DEPRECATED = @DISABLE_DEPRECATED@ +-DISTCHECK_CONFIGURE_FLAGS = @DISTCHECK_CONFIGURE_FLAGS@ + DOC_USER_FORMATS = @DOC_USER_FORMATS@ + ECHO = @ECHO@ + ECHO_C = @ECHO_C@ + ECHO_N = @ECHO_N@ + ECHO_T = @ECHO_T@ + EGREP = @EGREP@ + EPIPHANY_API_VERSION = @EPIPHANY_API_VERSION@ + EPIPHANY_FEATURES = @EPIPHANY_FEATURES@ +@@ -255,16 +257,17 @@ + GLADE_LIBS = @GLADE_LIBS@ + GLIB_GENMARSHAL = @GLIB_GENMARSHAL@ + GLIB_MKENUMS = @GLIB_MKENUMS@ + GMOFILES = @GMOFILES@ + GMSGFMT = @GMSGFMT@ + GNOME_CFLAGS = @GNOME_CFLAGS@ + GNOME_LIBS = @GNOME_LIBS@ + GREP = @GREP@ ++GTKDOC_CHECK = @GTKDOC_CHECK@ + GTKPRINT_CFLAGS = @GTKPRINT_CFLAGS@ + GTKPRINT_LIBS = @GTKPRINT_LIBS@ + GTK_CFLAGS = @GTK_CFLAGS@ + GTK_LIBS = @GTK_LIBS@ + HELP_DIR = @HELP_DIR@ + HTML_DIR = @HTML_DIR@ + INSTALL = @INSTALL@ + INSTALL_DATA = @INSTALL_DATA@ +@@ -313,16 +316,17 @@ + LSB_RELEASE = @LSB_RELEASE@ + LTLIBOBJS = @LTLIBOBJS@ + MAINT = @MAINT@ + MAKEINFO = @MAKEINFO@ + MKDIR_P = @MKDIR_P@ + MKINSTALLDIRS = @MKINSTALLDIRS@ + MSGFMT = @MSGFMT@ + MSGFMT_OPTS = @MSGFMT_OPTS@ ++MSGMERGE = @MSGMERGE@ + NO_STRICT_ALIASING_CFLAGS = @NO_STRICT_ALIASING_CFLAGS@ + OBJEXT = @OBJEXT@ + OMF_DIR = @OMF_DIR@ + PACKAGE = @PACKAGE@ + PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ + PACKAGE_NAME = @PACKAGE_NAME@ + PACKAGE_STRING = @PACKAGE_STRING@ + PACKAGE_TARNAME = @PACKAGE_TARNAME@ +@@ -487,30 +491,26 @@ + webbrowserpersist \ + webbrwsr \ + widget \ + windowwatcher \ + xmlextras \ + xpcom \ + xpconnect + +-libephymozillaembed_la_CPPFLAGS = \ +- -I$(top_srcdir)/lib \ +- -I$(top_srcdir)/embed \ +- -I$(top_srcdir) \ +- $(addprefix -I$(GECKO_INCLUDE_ROOT)/,$(mozilla_include_subdirs)) \ +- -DSHARE_DIR=\"$(pkgdatadir)\" \ +- -DPLUGINDIR=\"$(libexecdir)/$(EPIPHANY_MAJOR)/plugins\" \ +- -DMOZILLA_HOME=\"$(GECKO_HOME)\" \ +- -DMOZILLA_PREFIX=\"$(GECKO_PREFIX)\" \ +- -DMOZILLA_NATIVE_PLUGINSDIR=\"$(libdir)/mozilla/plugins\" \ +- -DUA_VERSION=\"$(EPIPHANY_UA_VERSION)\" \ +- -DALLOW_PRIVATE_API \ +- $(AM_CPPFLAGS) +- ++libephymozillaembed_la_CPPFLAGS = -I$(top_srcdir)/lib \ ++ -I$(top_srcdir)/embed -I$(top_srcdir) $(addprefix \ ++ -I$(GECKO_INCLUDE_ROOT)/,$(mozilla_include_subdirs)) \ ++ -DSHARE_DIR=\"$(pkgdatadir)\" \ ++ -DPLUGINDIR=\"$(libexecdir)/$(EPIPHANY_MAJOR)/plugins\" \ ++ -DMOZILLA_HOME=\"$(GECKO_HOME)\" \ ++ -DMOZILLA_PREFIX=\"$(GECKO_PREFIX)\" \ ++ -DMOZILLA_NATIVE_PLUGINSDIR=\"$(libdir)/mozilla/plugins\" \ ++ -DUA_VERSION=\"$(EPIPHANY_UA_VERSION)\" -DALLOW_PRIVATE_API \ ++ $(AM_CPPFLAGS) $(am__append_6) + libephymozillaembed_la_CXXFLAGS = \ + $(GECKO_CFLAGS) \ + $(DEPENDENCIES_CFLAGS) \ + $(AM_CXXFLAGS) + + all: all-am + + .SUFFIXES: +Index: epiphany-browser-2.21.90/gtk-doc.make +=================================================================== +--- /dev/null ++++ epiphany-browser-2.21.90/gtk-doc.make +@@ -0,0 +1,174 @@ ++# -*- mode: makefile -*- ++ ++#################################### ++# Everything below here is generic # ++#################################### ++ ++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) ++else ++GTKDOC_CC = $(CC) $(INCLUDES) $(AM_CFLAGS) $(CFLAGS) ++GTKDOC_LD = $(CC) $(AM_CFLAGS) $(CFLAGS) $(LDFLAGS) ++endif ++ ++# We set GPATH here; this gives us semantics for GNU make ++# which are more like other make's VPATH, when it comes to ++# whether a source that is a target of one rule is then ++# searched for in VPATH/GPATH. ++# ++GPATH = $(srcdir) ++ ++TARGET_DIR=$(HTML_DIR)/$(DOC_MODULE) ++ ++EXTRA_DIST = \ ++ $(content_files) \ ++ $(HTML_IMAGES) \ ++ $(DOC_MAIN_SGML_FILE) \ ++ $(DOC_MODULE)-sections.txt \ ++ $(DOC_MODULE)-overrides.txt ++ ++DOC_STAMPS=scan-build.stamp tmpl-build.stamp sgml-build.stamp html-build.stamp \ ++ $(srcdir)/tmpl.stamp $(srcdir)/sgml.stamp $(srcdir)/html.stamp ++ ++SCANOBJ_FILES = \ ++ $(DOC_MODULE).args \ ++ $(DOC_MODULE).hierarchy \ ++ $(DOC_MODULE).interfaces \ ++ $(DOC_MODULE).prerequisites \ ++ $(DOC_MODULE).signals ++ ++REPORT_FILES = \ ++ $(DOC_MODULE)-undocumented.txt \ ++ $(DOC_MODULE)-undeclared.txt \ ++ $(DOC_MODULE)-unused.txt ++ ++CLEANFILES = $(SCANOBJ_FILES) $(REPORT_FILES) $(DOC_STAMPS) ++ ++if ENABLE_GTK_DOC ++all-local: html-build.stamp ++else ++all-local: ++endif ++ ++docs: html-build.stamp ++ ++#### scan #### ++ ++scan-build.stamp: $(HFILE_GLOB) $(CFILE_GLOB) ++ @echo 'gtk-doc: Scanning header files' ++ @-chmod -R u+w $(srcdir) ++ cd $(srcdir) && \ ++ gtkdoc-scan --module=$(DOC_MODULE) --source-dir=$(DOC_SOURCE_DIR) --ignore-headers="$(IGNORE_HFILES)" $(SCAN_OPTIONS) $(EXTRA_HFILES) ++ if grep -l '^..*$$' $(srcdir)/$(DOC_MODULE).types > /dev/null 2>&1 ; then \ ++ CC="$(GTKDOC_CC)" LD="$(GTKDOC_LD)" CFLAGS="$(GTKDOC_CFLAGS)" LDFLAGS="$(GTKDOC_LIBS)" gtkdoc-scangobj $(SCANGOBJ_OPTIONS) --module=$(DOC_MODULE) --output-dir=$(srcdir) ; \ ++ else \ ++ cd $(srcdir) ; \ ++ for i in $(SCANOBJ_FILES) ; do \ ++ test -f $$i || touch $$i ; \ ++ done \ ++ fi ++ touch scan-build.stamp ++ ++$(DOC_MODULE)-decl.txt $(SCANOBJ_FILES) $(DOC_MODULE)-sections.txt $(DOC_MODULE)-overrides.txt: scan-build.stamp ++ @true ++ ++#### templates #### ++ ++tmpl-build.stamp: $(DOC_MODULE)-decl.txt $(SCANOBJ_FILES) $(DOC_MODULE)-sections.txt $(DOC_MODULE)-overrides.txt ++ @echo 'gtk-doc: Rebuilding template files' ++ @-chmod -R u+w $(srcdir) ++ cd $(srcdir) && gtkdoc-mktmpl --module=$(DOC_MODULE) $(MKTMPL_OPTIONS) ++ touch tmpl-build.stamp ++ ++tmpl.stamp: tmpl-build.stamp ++ @true ++ ++tmpl/*.sgml: ++ @true ++ ++ ++#### xml #### ++ ++sgml-build.stamp: tmpl.stamp $(HFILE_GLOB) $(CFILE_GLOB) $(DOC_MODULE)-sections.txt $(srcdir)/tmpl/*.sgml $(expand_content_files) ++ @echo 'gtk-doc: Building XML' ++ @-chmod -R u+w $(srcdir) ++ cd $(srcdir) && \ ++ gtkdoc-mkdb --module=$(DOC_MODULE) --source-dir=$(DOC_SOURCE_DIR) --output-format=xml --expand-content-files="$(expand_content_files)" --main-sgml-file=$(DOC_MAIN_SGML_FILE) $(MKDB_OPTIONS) ++ touch sgml-build.stamp ++ ++sgml.stamp: sgml-build.stamp ++ @true ++ ++#### html #### ++ ++html-build.stamp: sgml.stamp $(DOC_MAIN_SGML_FILE) $(content_files) ++ @echo 'gtk-doc: Building HTML' ++ @-chmod -R u+w $(srcdir) ++ rm -rf $(srcdir)/html ++ mkdir $(srcdir)/html ++ cd $(srcdir)/html && gtkdoc-mkhtml $(DOC_MODULE) ../$(DOC_MAIN_SGML_FILE) ++ test "x$(HTML_IMAGES)" = "x" || ( cd $(srcdir) && cp $(HTML_IMAGES) html ) ++ @echo 'gtk-doc: Fixing cross-references' ++ cd $(srcdir) && gtkdoc-fixxref --module-dir=html --html-dir=$(HTML_DIR) $(FIXXREF_OPTIONS) ++ touch html-build.stamp ++ ++############## ++ ++clean-local: ++ rm -f *~ *.bak ++ rm -rf .libs ++ ++distclean-local: ++ cd $(srcdir) && \ ++ rm -rf xml $(REPORT_FILES) \ ++ $(DOC_MODULE)-decl-list.txt $(DOC_MODULE)-decl.txt ++ ++maintainer-clean-local: clean ++ cd $(srcdir) && rm -rf xml html ++ ++install-data-local: ++ installfiles=`echo $(srcdir)/html/*`; \ ++ if test "$$installfiles" = '$(srcdir)/html/*'; \ ++ then echo '-- Nothing to install' ; \ ++ else \ ++ $(mkinstalldirs) $(DESTDIR)$(TARGET_DIR); \ ++ for i in $$installfiles; do \ ++ echo '-- Installing '$$i ; \ ++ $(INSTALL_DATA) $$i $(DESTDIR)$(TARGET_DIR); \ ++ done; \ ++ echo '-- Installing $(srcdir)/html/index.sgml' ; \ ++ $(INSTALL_DATA) $(srcdir)/html/index.sgml $(DESTDIR)$(TARGET_DIR) || :; \ ++ if test `which gtkdoc-rebase` != ""; then \ ++ gtkdoc-rebase --relative --dest-dir=$(DESTDIR) --html-dir=$(DESTDIR)$(TARGET_DIR) ; \ ++ fi \ ++ fi ++ ++ ++uninstall-local: ++ rm -f $(DESTDIR)$(TARGET_DIR)/* ++ ++# ++# Require gtk-doc when making dist ++# ++if ENABLE_GTK_DOC ++dist-check-gtkdoc: ++else ++dist-check-gtkdoc: ++ @echo "*** gtk-doc must be installed and enabled in order to make dist" ++ @false ++endif ++ ++dist-hook: dist-check-gtkdoc dist-hook-local ++ mkdir $(distdir)/tmpl ++ mkdir $(distdir)/xml ++ mkdir $(distdir)/html ++ -cp $(srcdir)/tmpl/*.sgml $(distdir)/tmpl ++ -cp $(srcdir)/xml/*.xml $(distdir)/xml ++ cp $(srcdir)/html/* $(distdir)/html ++ cp $(srcdir)/$(DOC_MODULE).types $(distdir)/ ++ cp $(srcdir)/$(DOC_MODULE)-sections.txt $(distdir)/ ++ cd $(distdir) && rm -f $(DISTCLEANFILES) ++ -gtkdoc-rebase --online --relative --html-dir=$(distdir)/html ++ ++.PHONY : dist-hook-local docs +Index: epiphany-browser-2.21.90/plugins/desktop-file/Makefile.in +=================================================================== +--- epiphany-browser-2.21.90.orig/plugins/desktop-file/Makefile.in ++++ epiphany-browser-2.21.90/plugins/desktop-file/Makefile.in +@@ -115,17 +115,16 @@ + DBUS_LIBS = @DBUS_LIBS@ + DEFS = @DEFS@ + DEPDIR = @DEPDIR@ + DEPENDENCIES_CFLAGS = @DEPENDENCIES_CFLAGS@ + DEPENDENCIES_LIBS = @DEPENDENCIES_LIBS@ + DESKTOP_FILE_PLUGIN_DEP_CFLAGS = @DESKTOP_FILE_PLUGIN_DEP_CFLAGS@ + DESKTOP_FILE_PLUGIN_DEP_LIBS = @DESKTOP_FILE_PLUGIN_DEP_LIBS@ + DISABLE_DEPRECATED = @DISABLE_DEPRECATED@ +-DISTCHECK_CONFIGURE_FLAGS = @DISTCHECK_CONFIGURE_FLAGS@ + DOC_USER_FORMATS = @DOC_USER_FORMATS@ + ECHO = @ECHO@ + ECHO_C = @ECHO_C@ + ECHO_N = @ECHO_N@ + ECHO_T = @ECHO_T@ + EGREP = @EGREP@ + EPIPHANY_API_VERSION = @EPIPHANY_API_VERSION@ + EPIPHANY_FEATURES = @EPIPHANY_FEATURES@ +@@ -155,16 +154,17 @@ + GLADE_LIBS = @GLADE_LIBS@ + GLIB_GENMARSHAL = @GLIB_GENMARSHAL@ + GLIB_MKENUMS = @GLIB_MKENUMS@ + GMOFILES = @GMOFILES@ + GMSGFMT = @GMSGFMT@ + GNOME_CFLAGS = @GNOME_CFLAGS@ + GNOME_LIBS = @GNOME_LIBS@ + GREP = @GREP@ ++GTKDOC_CHECK = @GTKDOC_CHECK@ + GTKPRINT_CFLAGS = @GTKPRINT_CFLAGS@ + GTKPRINT_LIBS = @GTKPRINT_LIBS@ + GTK_CFLAGS = @GTK_CFLAGS@ + GTK_LIBS = @GTK_LIBS@ + HELP_DIR = @HELP_DIR@ + HTML_DIR = @HTML_DIR@ + INSTALL = @INSTALL@ + INSTALL_DATA = @INSTALL_DATA@ +@@ -213,16 +213,17 @@ + LSB_RELEASE = @LSB_RELEASE@ + LTLIBOBJS = @LTLIBOBJS@ + MAINT = @MAINT@ + MAKEINFO = @MAKEINFO@ + MKDIR_P = @MKDIR_P@ + MKINSTALLDIRS = @MKINSTALLDIRS@ + MSGFMT = @MSGFMT@ + MSGFMT_OPTS = @MSGFMT_OPTS@ ++MSGMERGE = @MSGMERGE@ + NO_STRICT_ALIASING_CFLAGS = @NO_STRICT_ALIASING_CFLAGS@ + OBJEXT = @OBJEXT@ + OMF_DIR = @OMF_DIR@ + PACKAGE = @PACKAGE@ + PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ + PACKAGE_NAME = @PACKAGE_NAME@ + PACKAGE_STRING = @PACKAGE_STRING@ + PACKAGE_TARNAME = @PACKAGE_TARNAME@ +@@ -343,17 +344,16 @@ + $(AM_CXXFLAGS) + + libdesktopfileplugin_la_LIBADD = \ + $(DESKTOP_FILE_PLUGIN_DEP_LIBS) + + libdesktopfileplugin_la_LDFLAGS = \ + -module -avoid-version \ + -export-symbols $(srcdir)/plugin.symbols \ +- -R$(GECKO_HOME) \ + $(AM_LDFLAGS) + + EXTRA_DIST = \ + plugin.symbols + + all: all-am + + .SUFFIXES: +@@ -634,11 +634,15 @@ + install-html-am install-info install-info-am install-man \ + install-pdf install-pdf-am install-pluginLTLIBRARIES \ + install-ps install-ps-am install-strip installcheck \ + installcheck-am installdirs maintainer-clean \ + maintainer-clean-generic mostlyclean mostlyclean-compile \ + mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ + tags uninstall uninstall-am uninstall-pluginLTLIBRARIES + ++ ++@HAVE_GECKO_XPCOM_GLUE_FALSE@ libdesktopfileplugin_la_LDFLAGS += \ ++@HAVE_GECKO_XPCOM_GLUE_FALSE@ -R$(GECKO_HOME) \ ++@HAVE_GECKO_XPCOM_GLUE_FALSE@ $(NULL) + # Tell versions [3.59,3.63) of GNU make to not export all variables. + # Otherwise a system limit (for SysV at least) may be exceeded. + .NOEXPORT: +Index: epiphany-browser-2.21.90/src/Makefile.in +=================================================================== +--- epiphany-browser-2.21.90.orig/src/Makefile.in ++++ epiphany-browser-2.21.90/src/Makefile.in +@@ -53,24 +53,25 @@ + + @WITH_XULRUNNER_ENGINE_TRUE@am__append_6 = \ + @WITH_XULRUNNER_ENGINE_TRUE@ $(top_builddir)/embed/xulrunner/utils/libephyxulrunnerutils.la \ + @WITH_XULRUNNER_ENGINE_TRUE@ $(top_builddir)/embed/xulrunner/src/libgnomegeckoembed.la \ + @WITH_XULRUNNER_ENGINE_TRUE@ $(top_builddir)/embed/xulrunner/embed/libephyxulrunnerembed.la \ + @WITH_XULRUNNER_ENGINE_TRUE@ $(top_builddir)/embed/xulrunner/components/libephycomponents.la + + @WITH_GECKO_ENGINE_TRUE@am__append_7 = \ ++@WITH_GECKO_ENGINE_TRUE@ $(GECKO_LIBS) \ + @WITH_GECKO_ENGINE_TRUE@ $(top_builddir)/embed/mozilla/libephymozillaembed.la + + @WITH_WEBKIT_ENGINE_TRUE@am__append_8 = \ + @WITH_WEBKIT_ENGINE_TRUE@ $(top_builddir)/embed/webkit/libephywebkitembed.la + + @WITH_XULRUNNER_ENGINE_TRUE@am__append_9 = -R$(LIBXUL_LIBDIR) + @WITH_XULRUNNER_ENGINE_TRUE@am__append_10 = $(LIBXUL_LIBS) -lxpcomglue +-@WITH_GECKO_ENGINE_TRUE@am__append_11 = -R$(GECKO_HOME) ++@HAVE_GECKO_XPCOM_GLUE_FALSE@@WITH_GECKO_ENGINE_TRUE@am__append_11 = -R$(GECKO_HOME) + @WITH_GECKO_ENGINE_TRUE@am__append_12 = \ + @WITH_GECKO_ENGINE_TRUE@ $(GECKO_LIBS) \ + @WITH_GECKO_ENGINE_TRUE@ $(GECKO_EXTRA_LIBS) \ + @WITH_GECKO_ENGINE_TRUE@ $(GECKO_GLUE_LIBS) + + @WITH_WEBKIT_ENGINE_TRUE@am__append_13 = \ + @WITH_WEBKIT_ENGINE_TRUE@ $(WEBKIT_LIBS) + +@@ -191,56 +192,68 @@ + $(CFLAGS) $(libpyphany_la_LDFLAGS) $(LDFLAGS) -o $@ + @ENABLE_PYTHON_TRUE@am_libpyphany_la_rpath = + am__installdirs = "$(DESTDIR)$(bindir)" "$(DESTDIR)$(headerdir)" \ + "$(DESTDIR)$(pydefsdir)" + binPROGRAMS_INSTALL = $(INSTALL_PROGRAM) + PROGRAMS = $(bin_PROGRAMS) + am_epiphany_OBJECTS = epiphany-ephy-main.$(OBJEXT) + epiphany_OBJECTS = $(am_epiphany_OBJECTS) +-@WITH_XULRUNNER_ENGINE_TRUE@am__DEPENDENCIES_2 = \ ++@WITH_GECKO_ENGINE_TRUE@am__DEPENDENCIES_2 = $(am__DEPENDENCIES_1) \ ++@WITH_GECKO_ENGINE_TRUE@ $(top_builddir)/embed/mozilla/libephymozillaembed.la ++@WITH_XULRUNNER_ENGINE_TRUE@am__DEPENDENCIES_3 = \ + @WITH_XULRUNNER_ENGINE_TRUE@ $(am__DEPENDENCIES_1) +-@WITH_GECKO_ENGINE_TRUE@am__DEPENDENCIES_3 = $(am__DEPENDENCIES_1) \ ++@WITH_GECKO_ENGINE_TRUE@am__DEPENDENCIES_4 = $(am__DEPENDENCIES_1) \ + @WITH_GECKO_ENGINE_TRUE@ $(am__DEPENDENCIES_1) \ + @WITH_GECKO_ENGINE_TRUE@ $(am__DEPENDENCIES_1) +-@WITH_WEBKIT_ENGINE_TRUE@am__DEPENDENCIES_4 = $(am__DEPENDENCIES_1) +-@ENABLE_PYTHON_TRUE@am__DEPENDENCIES_5 = libpyphany.la \ ++@WITH_WEBKIT_ENGINE_TRUE@am__DEPENDENCIES_5 = $(am__DEPENDENCIES_1) ++@ENABLE_PYTHON_TRUE@am__DEPENDENCIES_6 = libpyphany.la \ + @ENABLE_PYTHON_TRUE@ $(am__DEPENDENCIES_1) \ + @ENABLE_PYTHON_TRUE@ $(am__DEPENDENCIES_1) \ + @ENABLE_PYTHON_TRUE@ $(am__DEPENDENCIES_1) \ + @ENABLE_PYTHON_TRUE@ $(am__DEPENDENCIES_1) + epiphany_DEPENDENCIES = libephymain.la \ + $(top_builddir)/src/bookmarks/libephybookmarks.la \ + $(top_builddir)/embed/libephyembedfactory.la $(am__append_6) \ +- $(am__append_7) $(am__append_8) \ ++ $(am__DEPENDENCIES_2) $(am__append_8) \ + $(top_builddir)/embed/libephyembed.la \ + $(top_builddir)/lib/widgets/libephywidgets.la \ + $(top_builddir)/lib/libephymisc.la \ +- $(top_builddir)/lib/egg/libegg.la $(am__DEPENDENCIES_2) \ +- $(am__DEPENDENCIES_3) $(am__DEPENDENCIES_4) \ ++ $(top_builddir)/lib/egg/libegg.la $(am__DEPENDENCIES_3) \ ++ $(am__DEPENDENCIES_4) $(am__DEPENDENCIES_5) \ + $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \ +- $(am__DEPENDENCIES_5) $(am__DEPENDENCIES_1) +-epiphany_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ +- --mode=link $(CCLD) $(epiphany_CFLAGS) $(CFLAGS) \ +- $(epiphany_LDFLAGS) $(LDFLAGS) -o $@ ++ $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_6) \ ++ $(am__DEPENDENCIES_1) ++epiphany_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) \ ++ $(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \ ++ $(CXXFLAGS) $(epiphany_LDFLAGS) $(LDFLAGS) -o $@ + DEFAULT_INCLUDES = -I. -I$(top_builddir)@am__isrc@ + depcomp = $(SHELL) $(top_srcdir)/depcomp + am__depfiles_maybe = depfiles + COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ + $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) + LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ + --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ + $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) + CCLD = $(CC) + LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ + --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \ + $(LDFLAGS) -o $@ ++CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ ++ $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) ++LTCXXCOMPILE = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ ++ --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ ++ $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) ++CXXLD = $(CXX) ++CXXLINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ ++ --mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(AM_LDFLAGS) \ ++ $(LDFLAGS) -o $@ + SOURCES = $(libephymain_la_SOURCES) $(nodist_libephymain_la_SOURCES) \ + $(libpyphany_la_SOURCES) $(nodist_libpyphany_la_SOURCES) \ +- $(epiphany_SOURCES) ++ $(epiphany_SOURCES) $(nodist_EXTRA_epiphany_SOURCES) + DIST_SOURCES = $(am__libephymain_la_SOURCES_DIST) \ + $(am__libpyphany_la_SOURCES_DIST) $(epiphany_SOURCES) + RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \ + html-recursive info-recursive install-data-recursive \ + install-dvi-recursive install-exec-recursive \ + install-html-recursive install-info-recursive \ + install-pdf-recursive install-ps-recursive install-recursive \ + installcheck-recursive installdirs-recursive pdf-recursive \ +@@ -294,17 +307,16 @@ + DBUS_LIBS = @DBUS_LIBS@ + DEFS = @DEFS@ + DEPDIR = @DEPDIR@ + DEPENDENCIES_CFLAGS = @DEPENDENCIES_CFLAGS@ + DEPENDENCIES_LIBS = @DEPENDENCIES_LIBS@ + DESKTOP_FILE_PLUGIN_DEP_CFLAGS = @DESKTOP_FILE_PLUGIN_DEP_CFLAGS@ + DESKTOP_FILE_PLUGIN_DEP_LIBS = @DESKTOP_FILE_PLUGIN_DEP_LIBS@ + DISABLE_DEPRECATED = @DISABLE_DEPRECATED@ +-DISTCHECK_CONFIGURE_FLAGS = @DISTCHECK_CONFIGURE_FLAGS@ + DOC_USER_FORMATS = @DOC_USER_FORMATS@ + ECHO = @ECHO@ + ECHO_C = @ECHO_C@ + ECHO_N = @ECHO_N@ + ECHO_T = @ECHO_T@ + EGREP = @EGREP@ + EPIPHANY_API_VERSION = @EPIPHANY_API_VERSION@ + EPIPHANY_FEATURES = @EPIPHANY_FEATURES@ +@@ -334,16 +346,17 @@ + GLADE_LIBS = @GLADE_LIBS@ + GLIB_GENMARSHAL = @GLIB_GENMARSHAL@ + GLIB_MKENUMS = @GLIB_MKENUMS@ + GMOFILES = @GMOFILES@ + GMSGFMT = @GMSGFMT@ + GNOME_CFLAGS = @GNOME_CFLAGS@ + GNOME_LIBS = @GNOME_LIBS@ + GREP = @GREP@ ++GTKDOC_CHECK = @GTKDOC_CHECK@ + GTKPRINT_CFLAGS = @GTKPRINT_CFLAGS@ + GTKPRINT_LIBS = @GTKPRINT_LIBS@ + GTK_CFLAGS = @GTK_CFLAGS@ + GTK_LIBS = @GTK_LIBS@ + HELP_DIR = @HELP_DIR@ + HTML_DIR = @HTML_DIR@ + INSTALL = @INSTALL@ + INSTALL_DATA = @INSTALL_DATA@ +@@ -392,16 +405,17 @@ + LSB_RELEASE = @LSB_RELEASE@ + LTLIBOBJS = @LTLIBOBJS@ + MAINT = @MAINT@ + MAKEINFO = @MAKEINFO@ + MKDIR_P = @MKDIR_P@ + MKINSTALLDIRS = @MKINSTALLDIRS@ + MSGFMT = @MSGFMT@ + MSGFMT_OPTS = @MSGFMT_OPTS@ ++MSGMERGE = @MSGMERGE@ + NO_STRICT_ALIASING_CFLAGS = @NO_STRICT_ALIASING_CFLAGS@ + OBJEXT = @OBJEXT@ + OMF_DIR = @OMF_DIR@ + PACKAGE = @PACKAGE@ + PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ + PACKAGE_NAME = @PACKAGE_NAME@ + PACKAGE_STRING = @PACKAGE_STRING@ + PACKAGE_TARNAME = @PACKAGE_TARNAME@ +@@ -612,43 +626,50 @@ + @ENABLE_PYTHON_TRUE@ -export-symbols-regex ephy_python_init + + @ENABLE_PYTHON_TRUE@libpyphany_la_LIBADD = \ + @ENABLE_PYTHON_TRUE@ $(DEPENDENCIES_LIBS) \ + @ENABLE_PYTHON_TRUE@ $(PYTHON_LIB_LOC) $(PYTHON_LIBS) \ + @ENABLE_PYTHON_TRUE@ $(PYTHON_EXTRA_LIBS) \ + @ENABLE_PYTHON_TRUE@ $(PYGTK_LIBS) + ++ ++# 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 ++@HAVE_GECKO_1_9_TRUE@@HAVE_GECKO_XPCOM_GLUE_TRUE@nodist_EXTRA_epiphany_SOURCES = dummy.cpp + epiphany_SOURCES = ephy-main.c + epiphany_CPPFLAGS = \ + -I$(top_builddir)/lib \ + -I$(top_srcdir)/embed \ + -I$(top_srcdir)/lib \ + -I$(top_srcdir)/src/bookmarks \ + -DDATADIR=\""$(datadir)"\" \ + -DGNOMELOCALEDIR=\"$(datadir)/locale\" \ + $(INCINTL) \ + $(AM_CPPFLAGS) + + epiphany_CFLAGS = \ + $(DEPENDENCIES_CFLAGS) \ ++ $(GECKO_CFLAGS) \ + $(DBUS_CFLAGS) \ + $(AM_CFLAGS) + + epiphany_LDFLAGS = -dlopen self $(am__append_9) $(am__append_11) + epiphany_LDADD = libephymain.la \ + $(top_builddir)/src/bookmarks/libephybookmarks.la \ + $(top_builddir)/embed/libephyembedfactory.la $(am__append_6) \ + $(am__append_7) $(am__append_8) \ + $(top_builddir)/embed/libephyembed.la \ + $(top_builddir)/lib/widgets/libephywidgets.la \ + $(top_builddir)/lib/libephymisc.la \ + $(top_builddir)/lib/egg/libegg.la $(am__append_10) \ +- $(am__append_12) $(am__append_13) $(DEPENDENCIES_LIBS) \ +- $(DBUS_LIBS) $(LIBINTL) $(am__append_14) $(am__append_15) ++ $(am__append_12) $(am__append_13) $(GECKO_LIBS) \ ++ $(DEPENDENCIES_LIBS) $(DBUS_LIBS) $(LIBINTL) $(am__append_14) \ ++ $(am__append_15) + @ENABLE_PYTHON_TRUE@pydefsdir = $(datadir)/pygtk/2.0/defs + @ENABLE_PYTHON_TRUE@pydefs_DATA = epiphany.defs + BUILT_SOURCES = $(TYPES_SOURCE) ephy-dbus-client-bindings.h \ + ephy-dbus-server-bindings.h $(am__append_16) + TYPES_SOURCE = \ + ephy-type-builtins.c \ + ephy-type-builtins.h + +@@ -817,17 +838,17 @@ + @ENABLE_PYTHON_TRUE@ $(BINDING_HEADERS_BUILDDIR) \ + @ENABLE_PYTHON_TRUE@ $(BINDING_HEADERS_BUILDDIR_IGNORE) + + @ENABLE_PYTHON_TRUE@BINDING_HEADERS_ALL_UNKNOWN = $(filter-out $(BINDING_HEADERS_ALL_KNOWN),$(BINDING_HEADERS_ALL)) + all: $(BUILT_SOURCES) + $(MAKE) $(AM_MAKEFLAGS) all-recursive + + .SUFFIXES: +-.SUFFIXES: .c .lo .o .obj ++.SUFFIXES: .c .cpp .lo .o .obj + $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) + @for dep in $?; do \ + case '$(am__configure_deps)' in \ + *$$dep*) \ + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \ + && exit 0; \ + exit 1;; \ + esac; \ +@@ -898,16 +919,17 @@ + $(epiphany_LINK) $(epiphany_OBJECTS) $(epiphany_LDADD) $(LIBS) + + mostlyclean-compile: + -rm -f *.$(OBJEXT) + + distclean-compile: + -rm -f *.tab.c + ++@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/epiphany-dummy.Po@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/epiphany-ephy-main.Po@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libephymain_la-ephy-action-helper.Plo@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libephymain_la-ephy-activation.Plo@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libephymain_la-ephy-cert-manager-dialog.Plo@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libephymain_la-ephy-completion-model.Plo@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libephymain_la-ephy-dbus.Plo@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libephymain_la-ephy-encoding-dialog.Plo@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libephymain_la-ephy-encoding-menu.Plo@am__quote@ +@@ -1247,16 +1269,51 @@ + + epiphany-ephy-main.obj: ephy-main.c + @am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(epiphany_CPPFLAGS) $(CPPFLAGS) $(epiphany_CFLAGS) $(CFLAGS) -MT epiphany-ephy-main.obj -MD -MP -MF $(DEPDIR)/epiphany-ephy-main.Tpo -c -o epiphany-ephy-main.obj `if test -f 'ephy-main.c'; then $(CYGPATH_W) 'ephy-main.c'; else $(CYGPATH_W) '$(srcdir)/ephy-main.c'; fi` + @am__fastdepCC_TRUE@ mv -f $(DEPDIR)/epiphany-ephy-main.Tpo $(DEPDIR)/epiphany-ephy-main.Po + @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='ephy-main.c' object='epiphany-ephy-main.obj' libtool=no @AMDEPBACKSLASH@ + @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ + @am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(epiphany_CPPFLAGS) $(CPPFLAGS) $(epiphany_CFLAGS) $(CFLAGS) -c -o epiphany-ephy-main.obj `if test -f 'ephy-main.c'; then $(CYGPATH_W) 'ephy-main.c'; else $(CYGPATH_W) '$(srcdir)/ephy-main.c'; fi` + ++.cpp.o: ++@am__fastdepCXX_TRUE@ $(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< ++@am__fastdepCXX_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po ++@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ ++@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ ++@am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ $< ++ ++.cpp.obj: ++@am__fastdepCXX_TRUE@ $(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` ++@am__fastdepCXX_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po ++@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ ++@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ ++@am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'` ++ ++.cpp.lo: ++@am__fastdepCXX_TRUE@ $(LTCXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< ++@am__fastdepCXX_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo ++@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ ++@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ ++@am__fastdepCXX_FALSE@ $(LTCXXCOMPILE) -c -o $@ $< ++ ++epiphany-dummy.o: dummy.cpp ++@am__fastdepCXX_TRUE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(epiphany_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT epiphany-dummy.o -MD -MP -MF $(DEPDIR)/epiphany-dummy.Tpo -c -o epiphany-dummy.o `test -f 'dummy.cpp' || echo '$(srcdir)/'`dummy.cpp ++@am__fastdepCXX_TRUE@ mv -f $(DEPDIR)/epiphany-dummy.Tpo $(DEPDIR)/epiphany-dummy.Po ++@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='dummy.cpp' object='epiphany-dummy.o' libtool=no @AMDEPBACKSLASH@ ++@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ ++@am__fastdepCXX_FALSE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(epiphany_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o epiphany-dummy.o `test -f 'dummy.cpp' || echo '$(srcdir)/'`dummy.cpp ++ ++epiphany-dummy.obj: dummy.cpp ++@am__fastdepCXX_TRUE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(epiphany_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT epiphany-dummy.obj -MD -MP -MF $(DEPDIR)/epiphany-dummy.Tpo -c -o epiphany-dummy.obj `if test -f 'dummy.cpp'; then $(CYGPATH_W) 'dummy.cpp'; else $(CYGPATH_W) '$(srcdir)/dummy.cpp'; fi` ++@am__fastdepCXX_TRUE@ mv -f $(DEPDIR)/epiphany-dummy.Tpo $(DEPDIR)/epiphany-dummy.Po ++@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='dummy.cpp' object='epiphany-dummy.obj' libtool=no @AMDEPBACKSLASH@ ++@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ ++@am__fastdepCXX_FALSE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(epiphany_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o epiphany-dummy.obj `if test -f 'dummy.cpp'; then $(CYGPATH_W) 'dummy.cpp'; else $(CYGPATH_W) '$(srcdir)/dummy.cpp'; fi` ++ + mostlyclean-libtool: + -rm -f *.lo + + clean-libtool: + -rm -rf .libs _libs + install-headerDATA: $(header_DATA) + @$(NORMAL_INSTALL) + test -z "$(headerdir)" || $(MKDIR_P) "$(DESTDIR)$(headerdir)" +--- epiphany-browser-2.21.90.orig/src/bookmarks/Makefile.in ++++ epiphany-browser-2.21.90/src/bookmarks/Makefile.in +@@ -152,7 +152,6 @@ + DESKTOP_FILE_PLUGIN_DEP_CFLAGS = @DESKTOP_FILE_PLUGIN_DEP_CFLAGS@ + DESKTOP_FILE_PLUGIN_DEP_LIBS = @DESKTOP_FILE_PLUGIN_DEP_LIBS@ + DISABLE_DEPRECATED = @DISABLE_DEPRECATED@ +-DISTCHECK_CONFIGURE_FLAGS = @DISTCHECK_CONFIGURE_FLAGS@ + DOC_USER_FORMATS = @DOC_USER_FORMATS@ + ECHO = @ECHO@ + ECHO_C = @ECHO_C@ +@@ -192,6 +191,7 @@ + GNOME_CFLAGS = @GNOME_CFLAGS@ + GNOME_LIBS = @GNOME_LIBS@ + GREP = @GREP@ ++GTKDOC_CHECK = @GTKDOC_CHECK@ + GTKPRINT_CFLAGS = @GTKPRINT_CFLAGS@ + GTKPRINT_LIBS = @GTKPRINT_LIBS@ + GTK_CFLAGS = @GTK_CFLAGS@ +@@ -250,6 +250,7 @@ + MKINSTALLDIRS = @MKINSTALLDIRS@ + MSGFMT = @MSGFMT@ + MSGFMT_OPTS = @MSGFMT_OPTS@ ++MSGMERGE = @MSGMERGE@ + NO_STRICT_ALIASING_CFLAGS = @NO_STRICT_ALIASING_CFLAGS@ + OBJEXT = @OBJEXT@ + OMF_DIR = @OMF_DIR@ +--- epiphany-browser-2.21.90.orig/intltool-update.in ++++ epiphany-browser-2.21.90/intltool-update.in +@@ -30,7 +30,7 @@ + + ## Release information + my $PROGRAM = "intltool-update"; +-my $VERSION = "0.36.1"; ++my $VERSION = "0.37.0"; + my $PACKAGE = "intltool"; + + ## Loaded modules +@@ -334,7 +334,7 @@ + push @buf_i18n_xml, "$File::Find::name" if /\.($xml_support)$/; + push @buf_i18n_ini, "$File::Find::name" if /\.($ini_support)$/; + push @buf_i18n_xml_unmarked, "$File::Find::name" if /\.(schemas(\.in)+)$/; +- }, "$SRCDIR/.."; ++ }, "$SRCDIR/.." if "$SRCDIR" ne "."; + + open POTFILES, $POTFILES_in or die "$PROGRAM: there's no POTFILES.in!\n"; + @buf_potfiles = grep !/^(#|\s*$)/, ; +@@ -434,8 +434,8 @@ + last; + } + +- ## N_ Q_ and _ are the three macros defined in gi8n.h +- if (/[NQ]?_ *\(QUOTEDTEXT/) ++ ## C_ N_ Q_ and _ are the macros defined in gi8n.h ++ if (/[CNQ]?_ *\(QUOTEDTEXT/) + { + if (defined isNotValidMissing (unpack("x3 A*", $file))) { + ## Remove the first 3 chars and add newline +@@ -777,7 +777,7 @@ + my $XGETTEXT_KEYWORDS = &FindPOTKeywords; + push @xgettext_argument, $XGETTEXT_KEYWORDS; + my $MSGID_BUGS_ADDRESS = &FindMakevarsBugAddress; +- push @xgettext_argument, "--msgid-bugs-address\=$MSGID_BUGS_ADDRESS" if $MSGID_BUGS_ADDRESS; ++ push @xgettext_argument, "--msgid-bugs-address\=\"$MSGID_BUGS_ADDRESS\"" if $MSGID_BUGS_ADDRESS; + push @xgettext_argument, "--from-code\=$encoding" if ($gettext_support_nonascii); + push @xgettext_argument, $XGETTEXT_ARGS if $XGETTEXT_ARGS; + my $xgettext_command = join ' ', @xgettext_argument; +--- epiphany-browser-2.21.90.orig/doc/Makefile.in ++++ epiphany-browser-2.21.90/doc/Makefile.in +@@ -102,7 +102,6 @@ + DESKTOP_FILE_PLUGIN_DEP_CFLAGS = @DESKTOP_FILE_PLUGIN_DEP_CFLAGS@ + DESKTOP_FILE_PLUGIN_DEP_LIBS = @DESKTOP_FILE_PLUGIN_DEP_LIBS@ + DISABLE_DEPRECATED = @DISABLE_DEPRECATED@ +-DISTCHECK_CONFIGURE_FLAGS = @DISTCHECK_CONFIGURE_FLAGS@ + DOC_USER_FORMATS = @DOC_USER_FORMATS@ + ECHO = @ECHO@ + ECHO_C = @ECHO_C@ +@@ -142,6 +141,7 @@ + GNOME_CFLAGS = @GNOME_CFLAGS@ + GNOME_LIBS = @GNOME_LIBS@ + GREP = @GREP@ ++GTKDOC_CHECK = @GTKDOC_CHECK@ + GTKPRINT_CFLAGS = @GTKPRINT_CFLAGS@ + GTKPRINT_LIBS = @GTKPRINT_LIBS@ + GTK_CFLAGS = @GTK_CFLAGS@ +@@ -200,6 +200,7 @@ + MKINSTALLDIRS = @MKINSTALLDIRS@ + MSGFMT = @MSGFMT@ + MSGFMT_OPTS = @MSGFMT_OPTS@ ++MSGMERGE = @MSGMERGE@ + NO_STRICT_ALIASING_CFLAGS = @NO_STRICT_ALIASING_CFLAGS@ + OBJEXT = @OBJEXT@ + OMF_DIR = @OMF_DIR@ +--- epiphany-browser-2.21.90.orig/gnome-doc-utils.make ++++ epiphany-browser-2.21.90/gnome-doc-utils.make +@@ -471,8 +471,8 @@ + + check-doc-omf: $(_DOC_OMF_ALL) + @list='$(_DOC_OMF_ALL)'; for omf in $$list; do \ +- echo "xmllint --noout --xinclude --dtdvalid 'http://scrollkeeper.sourceforge.net/dtds/scrollkeeper-omf-1.0/scrollkeeper-omf.dtd' $$omf"; \ +- xmllint --noout --xinclude --dtdvalid 'http://scrollkeeper.sourceforge.net/dtds/scrollkeeper-omf-1.0/scrollkeeper-omf.dtd' $$omf; \ ++ echo "xmllint --noout --dtdvalid 'http://scrollkeeper.sourceforge.net/dtds/scrollkeeper-omf-1.0/scrollkeeper-omf.dtd' $$omf"; \ ++ xmllint --noout --dtdvalid 'http://scrollkeeper.sourceforge.net/dtds/scrollkeeper-omf-1.0/scrollkeeper-omf.dtd' $$omf; \ + done + + +--- epiphany-browser-2.21.90.orig/m4/intltool.m4 ++++ epiphany-browser-2.21.90/m4/intltool.m4 +@@ -87,6 +87,20 @@ + AC_SUBST(INTLTOOL_SERVICE_RULE) + AC_SUBST(INTLTOOL_POLICY_RULE) + ++# Check the gettext tools to make sure they are GNU ++AC_PATH_PROG(XGETTEXT, xgettext) ++AC_PATH_PROG(MSGMERGE, msgmerge) ++AC_PATH_PROG(MSGFMT, msgfmt) ++if test -z "$XGETTEXT" -o -z "$MSGMERGE" -o -z "$MSGFMT"; then ++ AC_MSG_ERROR([GNU gettext tools not found; required for intltool]) ++fi ++xgversion="`$XGETTEXT --version|grep '(GNU ' 2> /dev/null`" ++mmversion="`$MSGMERGE --version|grep '(GNU ' 2> /dev/null`" ++mfversion="`$MSGFMT --version|grep '(GNU ' 2> /dev/null`" ++if test -z "$xgversion" -o -z "$mmversion" -o -z "$mfversion"; then ++ AC_MSG_ERROR([GNU gettext tools not found; required for intltool]) ++fi ++ + # Use the tools built into the package, not the ones that are installed. + AC_SUBST(INTLTOOL_EXTRACT, '$(top_builddir)/intltool-extract') + AC_SUBST(INTLTOOL_MERGE, '$(top_builddir)/intltool-merge') +--- epiphany-browser-2.21.90.orig/m4/gnome-doc-utils.m4 ++++ epiphany-browser-2.21.90/m4/gnome-doc-utils.m4 +@@ -26,10 +26,6 @@ + enable_scrollkeeper=yes) + AM_CONDITIONAL([ENABLE_SK],[test "$gdu_cv_have_gdu" = "yes" -a "$enable_scrollkeeper" = "yes"]) + +-dnl disable scrollkeeper automatically for distcheck +-DISTCHECK_CONFIGURE_FLAGS="--disable-scrollkeeper $DISTCHECK_CONFIGURE_FLAGS" +-AC_SUBST(DISTCHECK_CONFIGURE_FLAGS) +- + AM_CONDITIONAL([HAVE_GNOME_DOC_UTILS],[test "$gdu_cv_have_gdu" = "yes"]) + ]) + +--- epiphany-browser-2.21.90.orig/m4/gtk-doc.m4 ++++ epiphany-browser-2.21.90/m4/gtk-doc.m4 +@@ -21,33 +21,19 @@ + [use gtk-doc to build documentation [[default=no]]]),, + [enable_gtk_doc=no]) + +- have_gtk_doc=no + if test x$enable_gtk_doc = xyes; then +- if test -z "$PKG_CONFIG"; then +- AC_PATH_PROG([PKG_CONFIG], [pkg-config], [no]) +- fi +- if test "$PKG_CONFIG" != "no" && $PKG_CONFIG --exists gtk-doc; then +- have_gtk_doc=yes +- fi +- +- dnl do we want to do a version check? +-ifelse([$1],[],, +- [gtk_doc_min_version=$1 +- if test "$have_gtk_doc" = yes; then +- AC_MSG_CHECKING([gtk-doc version >= $gtk_doc_min_version]) +- if $PKG_CONFIG --atleast-version $gtk_doc_min_version gtk-doc; then +- AC_MSG_RESULT([yes]) +- else +- AC_MSG_RESULT([no]) +- have_gtk_doc=no +- fi +- fi +-]) +- if test "$have_gtk_doc" != yes; then +- enable_gtk_doc=no +- fi ++ ifelse([$1],[], ++ [PKG_CHECK_EXISTS([gtk-doc],, ++ AC_MSG_ERROR([gtk-doc not installed and --enable-gtk-doc requested]))], ++ [PKG_CHECK_EXISTS([gtk-doc >= $1],, ++ AC_MSG_ERROR([You need to have gtk-doc >= $1 installed to build gtk-doc]))]) + fi + ++ AC_MSG_CHECKING([whether to build gtk-doc documentation]) ++ AC_MSG_RESULT($enable_gtk_doc) ++ ++ AC_PATH_PROGS(GTKDOC_CHECK,gtkdoc-check,) ++ + AM_CONDITIONAL([ENABLE_GTK_DOC], [test x$enable_gtk_doc = xyes]) + AM_CONDITIONAL([GTK_DOC_USE_LIBTOOL], [test -n "$LIBTOOL"]) + ]) +--- epiphany-browser-2.21.90.orig/help/Makefile.in ++++ epiphany-browser-2.21.90/help/Makefile.in +@@ -111,7 +111,6 @@ + DESKTOP_FILE_PLUGIN_DEP_CFLAGS = @DESKTOP_FILE_PLUGIN_DEP_CFLAGS@ + DESKTOP_FILE_PLUGIN_DEP_LIBS = @DESKTOP_FILE_PLUGIN_DEP_LIBS@ + DISABLE_DEPRECATED = @DISABLE_DEPRECATED@ +-DISTCHECK_CONFIGURE_FLAGS = @DISTCHECK_CONFIGURE_FLAGS@ + DOC_USER_FORMATS = @DOC_USER_FORMATS@ + ECHO = @ECHO@ + ECHO_C = @ECHO_C@ +@@ -151,6 +150,7 @@ + GNOME_CFLAGS = @GNOME_CFLAGS@ + GNOME_LIBS = @GNOME_LIBS@ + GREP = @GREP@ ++GTKDOC_CHECK = @GTKDOC_CHECK@ + GTKPRINT_CFLAGS = @GTKPRINT_CFLAGS@ + GTKPRINT_LIBS = @GTKPRINT_LIBS@ + GTK_CFLAGS = @GTK_CFLAGS@ +@@ -209,6 +209,7 @@ + MKINSTALLDIRS = @MKINSTALLDIRS@ + MSGFMT = @MSGFMT@ + MSGFMT_OPTS = @MSGFMT_OPTS@ ++MSGMERGE = @MSGMERGE@ + NO_STRICT_ALIASING_CFLAGS = @NO_STRICT_ALIASING_CFLAGS@ + OBJEXT = @OBJEXT@ + OMF_DIR = @OMF_DIR@ +@@ -863,8 +864,8 @@ + + check-doc-omf: $(_DOC_OMF_ALL) + @list='$(_DOC_OMF_ALL)'; for omf in $$list; do \ +- echo "xmllint --noout --xinclude --dtdvalid 'http://scrollkeeper.sourceforge.net/dtds/scrollkeeper-omf-1.0/scrollkeeper-omf.dtd' $$omf"; \ +- xmllint --noout --xinclude --dtdvalid 'http://scrollkeeper.sourceforge.net/dtds/scrollkeeper-omf-1.0/scrollkeeper-omf.dtd' $$omf; \ ++ echo "xmllint --noout --dtdvalid 'http://scrollkeeper.sourceforge.net/dtds/scrollkeeper-omf-1.0/scrollkeeper-omf.dtd' $$omf"; \ ++ xmllint --noout --dtdvalid 'http://scrollkeeper.sourceforge.net/dtds/scrollkeeper-omf-1.0/scrollkeeper-omf.dtd' $$omf; \ + done + + .PHONY: install-doc-docs install-doc-html install-doc-figs install-doc-omf install-doc-dsk +--- epiphany-browser-2.21.90.orig/config.sub ++++ epiphany-browser-2.21.90/config.sub +@@ -4,7 +4,7 @@ + # 2000, 2001, 2002, 2003, 2004, 2005, 2006 Free Software Foundation, + # Inc. + +-timestamp='2007-01-18' ++timestamp='2007-06-28' + + # This file is (in principle) common to ALL GNU software. + # The presence of a machine in this file suggests that SOME GNU software +@@ -475,8 +475,8 @@ + basic_machine=craynv-cray + os=-unicosmp + ;; +- cr16c) +- basic_machine=cr16c-unknown ++ cr16) ++ basic_machine=cr16-unknown + os=-elf + ;; + crds | unos) +@@ -683,6 +683,10 @@ + basic_machine=i386-pc + os=-mingw32 + ;; ++ mingw32ce) ++ basic_machine=arm-unknown ++ os=-mingw32ce ++ ;; + miniframe) + basic_machine=m68000-convergent + ;; +--- epiphany-browser-2.21.90.orig/intltool-extract.in ++++ epiphany-browser-2.21.90/intltool-extract.in +@@ -32,7 +32,7 @@ + ## Release information + my $PROGRAM = "intltool-extract"; + my $PACKAGE = "intltool"; +-my $VERSION = "0.36.1"; ++my $VERSION = "0.37.0"; + + ## Loaded modules + use strict; +@@ -161,7 +161,8 @@ + --type=TYPE Specify the file type of FILENAME. Currently supports: + "gettext/glade", "gettext/ini", "gettext/keys" + "gettext/rfc822deb", "gettext/schemas", +- "gettext/scheme", "gettext/xml", "gettext/quoted" ++ "gettext/scheme", "gettext/xml", "gettext/quoted", ++ "gettext/quotedxml" + -l, --local Writes output into current working directory + (conflicts with --update) + --update Writes output into the same directory the source file +@@ -218,6 +219,7 @@ + &type_schemas if $gettext_type eq "schemas"; + &type_rfc822deb if $gettext_type eq "rfc822deb"; + &type_quoted if $gettext_type eq "quoted"; ++ &type_quotedxml if $gettext_type eq "quotedxml"; + } + + sub entity_decode_minimal +@@ -731,6 +733,18 @@ + } + } + ++sub type_quotedxml { ++ while ($input =~ /\"(([^\"]|\\\")*[^\\\"])\"/g) { ++ my $message = $1; ++ my $before = $`; ++ $message =~ s/\\\"/\"/g; ++ $message = entity_decode($message); ++ $before =~ s/[^\n]//g; ++ $messages{$message} = []; ++ $loc{$message} = length ($before) + 2; ++ } ++} ++ + sub type_glade { + ### For translatable Glade XML files ### + +--- epiphany-browser-2.21.90.orig/config.guess ++++ epiphany-browser-2.21.90/config.guess +@@ -4,7 +4,7 @@ + # 2000, 2001, 2002, 2003, 2004, 2005, 2006 Free Software Foundation, + # Inc. + +-timestamp='2007-03-06' ++timestamp='2007-07-22' + + # This file is free software; you can redistribute it and/or modify it + # under the terms of the GNU General Public License as published by +@@ -330,7 +330,7 @@ + sun4*:SunOS:5.*:* | tadpole*:SunOS:5.*:*) + echo sparc-sun-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'` + exit ;; +- i86pc:SunOS:5.*:*) ++ i86pc:SunOS:5.*:* | i86xen:SunOS:5.*:*) + echo i386-pc-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'` + exit ;; + sun4*:SunOS:6*:*) +@@ -793,7 +793,7 @@ + exit ;; + *:Interix*:[3456]*) + case ${UNAME_MACHINE} in +- x86) ++ x86) + echo i586-pc-interix${UNAME_RELEASE} + exit ;; + EM64T | authenticamd) +--- epiphany-browser-2.21.90.orig/xulapp/Makefile.in ++++ epiphany-browser-2.21.90/xulapp/Makefile.in +@@ -87,7 +87,6 @@ + DESKTOP_FILE_PLUGIN_DEP_CFLAGS = @DESKTOP_FILE_PLUGIN_DEP_CFLAGS@ + DESKTOP_FILE_PLUGIN_DEP_LIBS = @DESKTOP_FILE_PLUGIN_DEP_LIBS@ + DISABLE_DEPRECATED = @DISABLE_DEPRECATED@ +-DISTCHECK_CONFIGURE_FLAGS = @DISTCHECK_CONFIGURE_FLAGS@ + DOC_USER_FORMATS = @DOC_USER_FORMATS@ + ECHO = @ECHO@ + ECHO_C = @ECHO_C@ +@@ -127,6 +126,7 @@ + GNOME_CFLAGS = @GNOME_CFLAGS@ + GNOME_LIBS = @GNOME_LIBS@ + GREP = @GREP@ ++GTKDOC_CHECK = @GTKDOC_CHECK@ + GTKPRINT_CFLAGS = @GTKPRINT_CFLAGS@ + GTKPRINT_LIBS = @GTKPRINT_LIBS@ + GTK_CFLAGS = @GTK_CFLAGS@ +@@ -185,6 +185,7 @@ + MKINSTALLDIRS = @MKINSTALLDIRS@ + MSGFMT = @MSGFMT@ + MSGFMT_OPTS = @MSGFMT_OPTS@ ++MSGMERGE = @MSGMERGE@ + NO_STRICT_ALIASING_CFLAGS = @NO_STRICT_ALIASING_CFLAGS@ + OBJEXT = @OBJEXT@ + OMF_DIR = @OMF_DIR@ +--- epiphany-browser-2.21.90.orig/plugins/Makefile.in ++++ epiphany-browser-2.21.90/plugins/Makefile.in +@@ -98,7 +98,6 @@ + DESKTOP_FILE_PLUGIN_DEP_CFLAGS = @DESKTOP_FILE_PLUGIN_DEP_CFLAGS@ + DESKTOP_FILE_PLUGIN_DEP_LIBS = @DESKTOP_FILE_PLUGIN_DEP_LIBS@ + DISABLE_DEPRECATED = @DISABLE_DEPRECATED@ +-DISTCHECK_CONFIGURE_FLAGS = @DISTCHECK_CONFIGURE_FLAGS@ + DOC_USER_FORMATS = @DOC_USER_FORMATS@ + ECHO = @ECHO@ + ECHO_C = @ECHO_C@ +@@ -138,6 +137,7 @@ + GNOME_CFLAGS = @GNOME_CFLAGS@ + GNOME_LIBS = @GNOME_LIBS@ + GREP = @GREP@ ++GTKDOC_CHECK = @GTKDOC_CHECK@ + GTKPRINT_CFLAGS = @GTKPRINT_CFLAGS@ + GTKPRINT_LIBS = @GTKPRINT_LIBS@ + GTK_CFLAGS = @GTK_CFLAGS@ +@@ -196,6 +196,7 @@ + MKINSTALLDIRS = @MKINSTALLDIRS@ + MSGFMT = @MSGFMT@ + MSGFMT_OPTS = @MSGFMT_OPTS@ ++MSGMERGE = @MSGMERGE@ + NO_STRICT_ALIASING_CFLAGS = @NO_STRICT_ALIASING_CFLAGS@ + OBJEXT = @OBJEXT@ + OMF_DIR = @OMF_DIR@ +--- epiphany-browser-2.21.90.orig/embed/xulrunner/src/Makefile.in ++++ epiphany-browser-2.21.90/embed/xulrunner/src/Makefile.in +@@ -148,7 +148,6 @@ + DESKTOP_FILE_PLUGIN_DEP_CFLAGS = @DESKTOP_FILE_PLUGIN_DEP_CFLAGS@ + DESKTOP_FILE_PLUGIN_DEP_LIBS = @DESKTOP_FILE_PLUGIN_DEP_LIBS@ + DISABLE_DEPRECATED = @DISABLE_DEPRECATED@ +-DISTCHECK_CONFIGURE_FLAGS = @DISTCHECK_CONFIGURE_FLAGS@ + DOC_USER_FORMATS = @DOC_USER_FORMATS@ + ECHO = @ECHO@ + ECHO_C = @ECHO_C@ +@@ -188,6 +187,7 @@ + GNOME_CFLAGS = @GNOME_CFLAGS@ + GNOME_LIBS = @GNOME_LIBS@ + GREP = @GREP@ ++GTKDOC_CHECK = @GTKDOC_CHECK@ + GTKPRINT_CFLAGS = @GTKPRINT_CFLAGS@ + GTKPRINT_LIBS = @GTKPRINT_LIBS@ + GTK_CFLAGS = @GTK_CFLAGS@ +@@ -246,6 +246,7 @@ + MKINSTALLDIRS = @MKINSTALLDIRS@ + MSGFMT = @MSGFMT@ + MSGFMT_OPTS = @MSGFMT_OPTS@ ++MSGMERGE = @MSGMERGE@ + NO_STRICT_ALIASING_CFLAGS = @NO_STRICT_ALIASING_CFLAGS@ + OBJEXT = @OBJEXT@ + OMF_DIR = @OMF_DIR@ +--- epiphany-browser-2.21.90.orig/embed/xulrunner/embed/Makefile.in ++++ epiphany-browser-2.21.90/embed/xulrunner/embed/Makefile.in +@@ -133,7 +133,6 @@ + DESKTOP_FILE_PLUGIN_DEP_CFLAGS = @DESKTOP_FILE_PLUGIN_DEP_CFLAGS@ + DESKTOP_FILE_PLUGIN_DEP_LIBS = @DESKTOP_FILE_PLUGIN_DEP_LIBS@ + DISABLE_DEPRECATED = @DISABLE_DEPRECATED@ +-DISTCHECK_CONFIGURE_FLAGS = @DISTCHECK_CONFIGURE_FLAGS@ + DOC_USER_FORMATS = @DOC_USER_FORMATS@ + ECHO = @ECHO@ + ECHO_C = @ECHO_C@ +@@ -173,6 +172,7 @@ + GNOME_CFLAGS = @GNOME_CFLAGS@ + GNOME_LIBS = @GNOME_LIBS@ + GREP = @GREP@ ++GTKDOC_CHECK = @GTKDOC_CHECK@ + GTKPRINT_CFLAGS = @GTKPRINT_CFLAGS@ + GTKPRINT_LIBS = @GTKPRINT_LIBS@ + GTK_CFLAGS = @GTK_CFLAGS@ +@@ -231,6 +231,7 @@ + MKINSTALLDIRS = @MKINSTALLDIRS@ + MSGFMT = @MSGFMT@ + MSGFMT_OPTS = @MSGFMT_OPTS@ ++MSGMERGE = @MSGMERGE@ + NO_STRICT_ALIASING_CFLAGS = @NO_STRICT_ALIASING_CFLAGS@ + OBJEXT = @OBJEXT@ + OMF_DIR = @OMF_DIR@ +--- epiphany-browser-2.21.90.orig/embed/xulrunner/data/Makefile.in ++++ epiphany-browser-2.21.90/embed/xulrunner/data/Makefile.in +@@ -97,7 +97,6 @@ + DESKTOP_FILE_PLUGIN_DEP_CFLAGS = @DESKTOP_FILE_PLUGIN_DEP_CFLAGS@ + DESKTOP_FILE_PLUGIN_DEP_LIBS = @DESKTOP_FILE_PLUGIN_DEP_LIBS@ + DISABLE_DEPRECATED = @DISABLE_DEPRECATED@ +-DISTCHECK_CONFIGURE_FLAGS = @DISTCHECK_CONFIGURE_FLAGS@ + DOC_USER_FORMATS = @DOC_USER_FORMATS@ + ECHO = @ECHO@ + ECHO_C = @ECHO_C@ +@@ -137,6 +136,7 @@ + GNOME_CFLAGS = @GNOME_CFLAGS@ + GNOME_LIBS = @GNOME_LIBS@ + GREP = @GREP@ ++GTKDOC_CHECK = @GTKDOC_CHECK@ + GTKPRINT_CFLAGS = @GTKPRINT_CFLAGS@ + GTKPRINT_LIBS = @GTKPRINT_LIBS@ + GTK_CFLAGS = @GTK_CFLAGS@ +@@ -195,6 +195,7 @@ + MKINSTALLDIRS = @MKINSTALLDIRS@ + MSGFMT = @MSGFMT@ + MSGFMT_OPTS = @MSGFMT_OPTS@ ++MSGMERGE = @MSGMERGE@ + NO_STRICT_ALIASING_CFLAGS = @NO_STRICT_ALIASING_CFLAGS@ + OBJEXT = @OBJEXT@ + OMF_DIR = @OMF_DIR@ +--- epiphany-browser-2.21.90.orig/embed/xulrunner/components/Makefile.in ++++ epiphany-browser-2.21.90/embed/xulrunner/components/Makefile.in +@@ -142,7 +142,6 @@ + DESKTOP_FILE_PLUGIN_DEP_CFLAGS = @DESKTOP_FILE_PLUGIN_DEP_CFLAGS@ + DESKTOP_FILE_PLUGIN_DEP_LIBS = @DESKTOP_FILE_PLUGIN_DEP_LIBS@ + DISABLE_DEPRECATED = @DISABLE_DEPRECATED@ +-DISTCHECK_CONFIGURE_FLAGS = @DISTCHECK_CONFIGURE_FLAGS@ + DOC_USER_FORMATS = @DOC_USER_FORMATS@ + ECHO = @ECHO@ + ECHO_C = @ECHO_C@ +@@ -182,6 +181,7 @@ + GNOME_CFLAGS = @GNOME_CFLAGS@ + GNOME_LIBS = @GNOME_LIBS@ + GREP = @GREP@ ++GTKDOC_CHECK = @GTKDOC_CHECK@ + GTKPRINT_CFLAGS = @GTKPRINT_CFLAGS@ + GTKPRINT_LIBS = @GTKPRINT_LIBS@ + GTK_CFLAGS = @GTK_CFLAGS@ +@@ -240,6 +240,7 @@ + MKINSTALLDIRS = @MKINSTALLDIRS@ + MSGFMT = @MSGFMT@ + MSGFMT_OPTS = @MSGFMT_OPTS@ ++MSGMERGE = @MSGMERGE@ + NO_STRICT_ALIASING_CFLAGS = @NO_STRICT_ALIASING_CFLAGS@ + OBJEXT = @OBJEXT@ + OMF_DIR = @OMF_DIR@ +--- epiphany-browser-2.21.90.orig/embed/xulrunner/utils/Makefile.in ++++ epiphany-browser-2.21.90/embed/xulrunner/utils/Makefile.in +@@ -129,7 +129,6 @@ + DESKTOP_FILE_PLUGIN_DEP_CFLAGS = @DESKTOP_FILE_PLUGIN_DEP_CFLAGS@ + DESKTOP_FILE_PLUGIN_DEP_LIBS = @DESKTOP_FILE_PLUGIN_DEP_LIBS@ + DISABLE_DEPRECATED = @DISABLE_DEPRECATED@ +-DISTCHECK_CONFIGURE_FLAGS = @DISTCHECK_CONFIGURE_FLAGS@ + DOC_USER_FORMATS = @DOC_USER_FORMATS@ + ECHO = @ECHO@ + ECHO_C = @ECHO_C@ +@@ -169,6 +168,7 @@ + GNOME_CFLAGS = @GNOME_CFLAGS@ + GNOME_LIBS = @GNOME_LIBS@ + GREP = @GREP@ ++GTKDOC_CHECK = @GTKDOC_CHECK@ + GTKPRINT_CFLAGS = @GTKPRINT_CFLAGS@ + GTKPRINT_LIBS = @GTKPRINT_LIBS@ + GTK_CFLAGS = @GTK_CFLAGS@ +@@ -227,6 +227,7 @@ + MKINSTALLDIRS = @MKINSTALLDIRS@ + MSGFMT = @MSGFMT@ + MSGFMT_OPTS = @MSGFMT_OPTS@ ++MSGMERGE = @MSGMERGE@ + NO_STRICT_ALIASING_CFLAGS = @NO_STRICT_ALIASING_CFLAGS@ + OBJEXT = @OBJEXT@ + OMF_DIR = @OMF_DIR@ +--- epiphany-browser-2.21.90.orig/embed/xulrunner/Makefile.in ++++ epiphany-browser-2.21.90/embed/xulrunner/Makefile.in +@@ -98,7 +98,6 @@ + DESKTOP_FILE_PLUGIN_DEP_CFLAGS = @DESKTOP_FILE_PLUGIN_DEP_CFLAGS@ + DESKTOP_FILE_PLUGIN_DEP_LIBS = @DESKTOP_FILE_PLUGIN_DEP_LIBS@ + DISABLE_DEPRECATED = @DISABLE_DEPRECATED@ +-DISTCHECK_CONFIGURE_FLAGS = @DISTCHECK_CONFIGURE_FLAGS@ + DOC_USER_FORMATS = @DOC_USER_FORMATS@ + ECHO = @ECHO@ + ECHO_C = @ECHO_C@ +@@ -138,6 +137,7 @@ + GNOME_CFLAGS = @GNOME_CFLAGS@ + GNOME_LIBS = @GNOME_LIBS@ + GREP = @GREP@ ++GTKDOC_CHECK = @GTKDOC_CHECK@ + GTKPRINT_CFLAGS = @GTKPRINT_CFLAGS@ + GTKPRINT_LIBS = @GTKPRINT_LIBS@ + GTK_CFLAGS = @GTK_CFLAGS@ +@@ -196,6 +196,7 @@ + MKINSTALLDIRS = @MKINSTALLDIRS@ + MSGFMT = @MSGFMT@ + MSGFMT_OPTS = @MSGFMT_OPTS@ ++MSGMERGE = @MSGMERGE@ + NO_STRICT_ALIASING_CFLAGS = @NO_STRICT_ALIASING_CFLAGS@ + OBJEXT = @OBJEXT@ + OMF_DIR = @OMF_DIR@ +--- epiphany-browser-2.21.90.orig/embed/xulrunner/bindings/Makefile.in ++++ epiphany-browser-2.21.90/embed/xulrunner/bindings/Makefile.in +@@ -97,7 +97,6 @@ + DESKTOP_FILE_PLUGIN_DEP_CFLAGS = @DESKTOP_FILE_PLUGIN_DEP_CFLAGS@ + DESKTOP_FILE_PLUGIN_DEP_LIBS = @DESKTOP_FILE_PLUGIN_DEP_LIBS@ + DISABLE_DEPRECATED = @DISABLE_DEPRECATED@ +-DISTCHECK_CONFIGURE_FLAGS = @DISTCHECK_CONFIGURE_FLAGS@ + DOC_USER_FORMATS = @DOC_USER_FORMATS@ + ECHO = @ECHO@ + ECHO_C = @ECHO_C@ +@@ -137,6 +136,7 @@ + GNOME_CFLAGS = @GNOME_CFLAGS@ + GNOME_LIBS = @GNOME_LIBS@ + GREP = @GREP@ ++GTKDOC_CHECK = @GTKDOC_CHECK@ + GTKPRINT_CFLAGS = @GTKPRINT_CFLAGS@ + GTKPRINT_LIBS = @GTKPRINT_LIBS@ + GTK_CFLAGS = @GTK_CFLAGS@ +@@ -195,6 +195,7 @@ + MKINSTALLDIRS = @MKINSTALLDIRS@ + MSGFMT = @MSGFMT@ + MSGFMT_OPTS = @MSGFMT_OPTS@ ++MSGMERGE = @MSGMERGE@ + NO_STRICT_ALIASING_CFLAGS = @NO_STRICT_ALIASING_CFLAGS@ + OBJEXT = @OBJEXT@ + OMF_DIR = @OMF_DIR@ +--- epiphany-browser-2.21.90.orig/embed/xulrunner/bindings/python/Makefile.in ++++ epiphany-browser-2.21.90/embed/xulrunner/bindings/python/Makefile.in +@@ -129,7 +129,6 @@ + DESKTOP_FILE_PLUGIN_DEP_CFLAGS = @DESKTOP_FILE_PLUGIN_DEP_CFLAGS@ + DESKTOP_FILE_PLUGIN_DEP_LIBS = @DESKTOP_FILE_PLUGIN_DEP_LIBS@ + DISABLE_DEPRECATED = @DISABLE_DEPRECATED@ +-DISTCHECK_CONFIGURE_FLAGS = @DISTCHECK_CONFIGURE_FLAGS@ + DOC_USER_FORMATS = @DOC_USER_FORMATS@ + ECHO = @ECHO@ + ECHO_C = @ECHO_C@ +@@ -169,6 +168,7 @@ + GNOME_CFLAGS = @GNOME_CFLAGS@ + GNOME_LIBS = @GNOME_LIBS@ + GREP = @GREP@ ++GTKDOC_CHECK = @GTKDOC_CHECK@ + GTKPRINT_CFLAGS = @GTKPRINT_CFLAGS@ + GTKPRINT_LIBS = @GTKPRINT_LIBS@ + GTK_CFLAGS = @GTK_CFLAGS@ +@@ -227,6 +227,7 @@ + MKINSTALLDIRS = @MKINSTALLDIRS@ + MSGFMT = @MSGFMT@ + MSGFMT_OPTS = @MSGFMT_OPTS@ ++MSGMERGE = @MSGMERGE@ + NO_STRICT_ALIASING_CFLAGS = @NO_STRICT_ALIASING_CFLAGS@ + OBJEXT = @OBJEXT@ + OMF_DIR = @OMF_DIR@ +--- epiphany-browser-2.21.90.orig/embed/xulrunner/tests/Makefile.in ++++ epiphany-browser-2.21.90/embed/xulrunner/tests/Makefile.in +@@ -116,7 +116,6 @@ + DESKTOP_FILE_PLUGIN_DEP_CFLAGS = @DESKTOP_FILE_PLUGIN_DEP_CFLAGS@ + DESKTOP_FILE_PLUGIN_DEP_LIBS = @DESKTOP_FILE_PLUGIN_DEP_LIBS@ + DISABLE_DEPRECATED = @DISABLE_DEPRECATED@ +-DISTCHECK_CONFIGURE_FLAGS = @DISTCHECK_CONFIGURE_FLAGS@ + DOC_USER_FORMATS = @DOC_USER_FORMATS@ + ECHO = @ECHO@ + ECHO_C = @ECHO_C@ +@@ -156,6 +155,7 @@ + GNOME_CFLAGS = @GNOME_CFLAGS@ + GNOME_LIBS = @GNOME_LIBS@ + GREP = @GREP@ ++GTKDOC_CHECK = @GTKDOC_CHECK@ + GTKPRINT_CFLAGS = @GTKPRINT_CFLAGS@ + GTKPRINT_LIBS = @GTKPRINT_LIBS@ + GTK_CFLAGS = @GTK_CFLAGS@ +@@ -214,6 +214,7 @@ + MKINSTALLDIRS = @MKINSTALLDIRS@ + MSGFMT = @MSGFMT@ + MSGFMT_OPTS = @MSGFMT_OPTS@ ++MSGMERGE = @MSGMERGE@ + NO_STRICT_ALIASING_CFLAGS = @NO_STRICT_ALIASING_CFLAGS@ + OBJEXT = @OBJEXT@ + OMF_DIR = @OMF_DIR@ +--- epiphany-browser-2.21.90.orig/embed/webkit/Makefile.in ++++ epiphany-browser-2.21.90/embed/webkit/Makefile.in +@@ -109,7 +109,6 @@ + DESKTOP_FILE_PLUGIN_DEP_CFLAGS = @DESKTOP_FILE_PLUGIN_DEP_CFLAGS@ + DESKTOP_FILE_PLUGIN_DEP_LIBS = @DESKTOP_FILE_PLUGIN_DEP_LIBS@ + DISABLE_DEPRECATED = @DISABLE_DEPRECATED@ +-DISTCHECK_CONFIGURE_FLAGS = @DISTCHECK_CONFIGURE_FLAGS@ + DOC_USER_FORMATS = @DOC_USER_FORMATS@ + ECHO = @ECHO@ + ECHO_C = @ECHO_C@ +@@ -149,6 +148,7 @@ + GNOME_CFLAGS = @GNOME_CFLAGS@ + GNOME_LIBS = @GNOME_LIBS@ + GREP = @GREP@ ++GTKDOC_CHECK = @GTKDOC_CHECK@ + GTKPRINT_CFLAGS = @GTKPRINT_CFLAGS@ + GTKPRINT_LIBS = @GTKPRINT_LIBS@ + GTK_CFLAGS = @GTK_CFLAGS@ +@@ -207,6 +207,7 @@ + MKINSTALLDIRS = @MKINSTALLDIRS@ + MSGFMT = @MSGFMT@ + MSGFMT_OPTS = @MSGFMT_OPTS@ ++MSGMERGE = @MSGMERGE@ + NO_STRICT_ALIASING_CFLAGS = @NO_STRICT_ALIASING_CFLAGS@ + OBJEXT = @OBJEXT@ + OMF_DIR = @OMF_DIR@ +--- epiphany-browser-2.21.90.orig/data/ui/Makefile.in ++++ epiphany-browser-2.21.90/data/ui/Makefile.in +@@ -96,7 +96,6 @@ + DESKTOP_FILE_PLUGIN_DEP_CFLAGS = @DESKTOP_FILE_PLUGIN_DEP_CFLAGS@ + DESKTOP_FILE_PLUGIN_DEP_LIBS = @DESKTOP_FILE_PLUGIN_DEP_LIBS@ + DISABLE_DEPRECATED = @DISABLE_DEPRECATED@ +-DISTCHECK_CONFIGURE_FLAGS = @DISTCHECK_CONFIGURE_FLAGS@ + DOC_USER_FORMATS = @DOC_USER_FORMATS@ + ECHO = @ECHO@ + ECHO_C = @ECHO_C@ +@@ -136,6 +135,7 @@ + GNOME_CFLAGS = @GNOME_CFLAGS@ + GNOME_LIBS = @GNOME_LIBS@ + GREP = @GREP@ ++GTKDOC_CHECK = @GTKDOC_CHECK@ + GTKPRINT_CFLAGS = @GTKPRINT_CFLAGS@ + GTKPRINT_LIBS = @GTKPRINT_LIBS@ + GTK_CFLAGS = @GTK_CFLAGS@ +@@ -194,6 +194,7 @@ + MKINSTALLDIRS = @MKINSTALLDIRS@ + MSGFMT = @MSGFMT@ + MSGFMT_OPTS = @MSGFMT_OPTS@ ++MSGMERGE = @MSGMERGE@ + NO_STRICT_ALIASING_CFLAGS = @NO_STRICT_ALIASING_CFLAGS@ + OBJEXT = @OBJEXT@ + OMF_DIR = @OMF_DIR@ +--- epiphany-browser-2.21.90.orig/data/art/Makefile.in ++++ epiphany-browser-2.21.90/data/art/Makefile.in +@@ -97,7 +97,6 @@ + DESKTOP_FILE_PLUGIN_DEP_CFLAGS = @DESKTOP_FILE_PLUGIN_DEP_CFLAGS@ + DESKTOP_FILE_PLUGIN_DEP_LIBS = @DESKTOP_FILE_PLUGIN_DEP_LIBS@ + DISABLE_DEPRECATED = @DISABLE_DEPRECATED@ +-DISTCHECK_CONFIGURE_FLAGS = @DISTCHECK_CONFIGURE_FLAGS@ + DOC_USER_FORMATS = @DOC_USER_FORMATS@ + ECHO = @ECHO@ + ECHO_C = @ECHO_C@ +@@ -137,6 +136,7 @@ + GNOME_CFLAGS = @GNOME_CFLAGS@ + GNOME_LIBS = @GNOME_LIBS@ + GREP = @GREP@ ++GTKDOC_CHECK = @GTKDOC_CHECK@ + GTKPRINT_CFLAGS = @GTKPRINT_CFLAGS@ + GTKPRINT_LIBS = @GTKPRINT_LIBS@ + GTK_CFLAGS = @GTK_CFLAGS@ +@@ -195,6 +195,7 @@ + MKINSTALLDIRS = @MKINSTALLDIRS@ + MSGFMT = @MSGFMT@ + MSGFMT_OPTS = @MSGFMT_OPTS@ ++MSGMERGE = @MSGMERGE@ + NO_STRICT_ALIASING_CFLAGS = @NO_STRICT_ALIASING_CFLAGS@ + OBJEXT = @OBJEXT@ + OMF_DIR = @OMF_DIR@ +--- epiphany-browser-2.21.90.orig/data/chrome/Makefile.in ++++ epiphany-browser-2.21.90/data/chrome/Makefile.in +@@ -100,7 +100,6 @@ + DESKTOP_FILE_PLUGIN_DEP_CFLAGS = @DESKTOP_FILE_PLUGIN_DEP_CFLAGS@ + DESKTOP_FILE_PLUGIN_DEP_LIBS = @DESKTOP_FILE_PLUGIN_DEP_LIBS@ + DISABLE_DEPRECATED = @DISABLE_DEPRECATED@ +-DISTCHECK_CONFIGURE_FLAGS = @DISTCHECK_CONFIGURE_FLAGS@ + DOC_USER_FORMATS = @DOC_USER_FORMATS@ + ECHO = @ECHO@ + ECHO_C = @ECHO_C@ +@@ -140,6 +139,7 @@ + GNOME_CFLAGS = @GNOME_CFLAGS@ + GNOME_LIBS = @GNOME_LIBS@ + GREP = @GREP@ ++GTKDOC_CHECK = @GTKDOC_CHECK@ + GTKPRINT_CFLAGS = @GTKPRINT_CFLAGS@ + GTKPRINT_LIBS = @GTKPRINT_LIBS@ + GTK_CFLAGS = @GTK_CFLAGS@ +@@ -198,6 +198,7 @@ + MKINSTALLDIRS = @MKINSTALLDIRS@ + MSGFMT = @MSGFMT@ + MSGFMT_OPTS = @MSGFMT_OPTS@ ++MSGMERGE = @MSGMERGE@ + NO_STRICT_ALIASING_CFLAGS = @NO_STRICT_ALIASING_CFLAGS@ + OBJEXT = @OBJEXT@ + OMF_DIR = @OMF_DIR@ +--- epiphany-browser-2.21.90.orig/data/icons/Makefile.in ++++ epiphany-browser-2.21.90/data/icons/Makefile.in +@@ -88,7 +88,6 @@ + DESKTOP_FILE_PLUGIN_DEP_CFLAGS = @DESKTOP_FILE_PLUGIN_DEP_CFLAGS@ + DESKTOP_FILE_PLUGIN_DEP_LIBS = @DESKTOP_FILE_PLUGIN_DEP_LIBS@ + DISABLE_DEPRECATED = @DISABLE_DEPRECATED@ +-DISTCHECK_CONFIGURE_FLAGS = @DISTCHECK_CONFIGURE_FLAGS@ + DOC_USER_FORMATS = @DOC_USER_FORMATS@ + ECHO = @ECHO@ + ECHO_C = @ECHO_C@ +@@ -128,6 +127,7 @@ + GNOME_CFLAGS = @GNOME_CFLAGS@ + GNOME_LIBS = @GNOME_LIBS@ + GREP = @GREP@ ++GTKDOC_CHECK = @GTKDOC_CHECK@ + GTKPRINT_CFLAGS = @GTKPRINT_CFLAGS@ + GTKPRINT_LIBS = @GTKPRINT_LIBS@ + GTK_CFLAGS = @GTK_CFLAGS@ +@@ -186,6 +186,7 @@ + MKINSTALLDIRS = @MKINSTALLDIRS@ + MSGFMT = @MSGFMT@ + MSGFMT_OPTS = @MSGFMT_OPTS@ ++MSGMERGE = @MSGMERGE@ + NO_STRICT_ALIASING_CFLAGS = @NO_STRICT_ALIASING_CFLAGS@ + OBJEXT = @OBJEXT@ + OMF_DIR = @OMF_DIR@ +--- epiphany-browser-2.21.90.orig/data/glade/Makefile.in ++++ epiphany-browser-2.21.90/data/glade/Makefile.in +@@ -99,7 +99,6 @@ + DESKTOP_FILE_PLUGIN_DEP_CFLAGS = @DESKTOP_FILE_PLUGIN_DEP_CFLAGS@ + DESKTOP_FILE_PLUGIN_DEP_LIBS = @DESKTOP_FILE_PLUGIN_DEP_LIBS@ + DISABLE_DEPRECATED = @DISABLE_DEPRECATED@ +-DISTCHECK_CONFIGURE_FLAGS = @DISTCHECK_CONFIGURE_FLAGS@ + DOC_USER_FORMATS = @DOC_USER_FORMATS@ + ECHO = @ECHO@ + ECHO_C = @ECHO_C@ +@@ -139,6 +138,7 @@ + GNOME_CFLAGS = @GNOME_CFLAGS@ + GNOME_LIBS = @GNOME_LIBS@ + GREP = @GREP@ ++GTKDOC_CHECK = @GTKDOC_CHECK@ + GTKPRINT_CFLAGS = @GTKPRINT_CFLAGS@ + GTKPRINT_LIBS = @GTKPRINT_LIBS@ + GTK_CFLAGS = @GTK_CFLAGS@ +@@ -197,6 +197,7 @@ + MKINSTALLDIRS = @MKINSTALLDIRS@ + MSGFMT = @MSGFMT@ + MSGFMT_OPTS = @MSGFMT_OPTS@ ++MSGMERGE = @MSGMERGE@ + NO_STRICT_ALIASING_CFLAGS = @NO_STRICT_ALIASING_CFLAGS@ + OBJEXT = @OBJEXT@ + OMF_DIR = @OMF_DIR@ +--- epiphany-browser-2.21.90.orig/data/Makefile.in ++++ epiphany-browser-2.21.90/data/Makefile.in +@@ -128,7 +128,6 @@ + DESKTOP_FILE_PLUGIN_DEP_CFLAGS = @DESKTOP_FILE_PLUGIN_DEP_CFLAGS@ + DESKTOP_FILE_PLUGIN_DEP_LIBS = @DESKTOP_FILE_PLUGIN_DEP_LIBS@ + DISABLE_DEPRECATED = @DISABLE_DEPRECATED@ +-DISTCHECK_CONFIGURE_FLAGS = @DISTCHECK_CONFIGURE_FLAGS@ + DOC_USER_FORMATS = @DOC_USER_FORMATS@ + ECHO = @ECHO@ + ECHO_C = @ECHO_C@ +@@ -168,6 +167,7 @@ + GNOME_CFLAGS = @GNOME_CFLAGS@ + GNOME_LIBS = @GNOME_LIBS@ + GREP = @GREP@ ++GTKDOC_CHECK = @GTKDOC_CHECK@ + GTKPRINT_CFLAGS = @GTKPRINT_CFLAGS@ + GTKPRINT_LIBS = @GTKPRINT_LIBS@ + GTK_CFLAGS = @GTK_CFLAGS@ +@@ -226,6 +226,7 @@ + MKINSTALLDIRS = @MKINSTALLDIRS@ + MSGFMT = @MSGFMT@ + MSGFMT_OPTS = @MSGFMT_OPTS@ ++MSGMERGE = @MSGMERGE@ + NO_STRICT_ALIASING_CFLAGS = @NO_STRICT_ALIASING_CFLAGS@ + OBJEXT = @OBJEXT@ + OMF_DIR = @OMF_DIR@ +--- epiphany-browser-2.21.90.orig/lib/widgets/Makefile.in ++++ epiphany-browser-2.21.90/lib/widgets/Makefile.in +@@ -118,7 +118,6 @@ + DESKTOP_FILE_PLUGIN_DEP_CFLAGS = @DESKTOP_FILE_PLUGIN_DEP_CFLAGS@ + DESKTOP_FILE_PLUGIN_DEP_LIBS = @DESKTOP_FILE_PLUGIN_DEP_LIBS@ + DISABLE_DEPRECATED = @DISABLE_DEPRECATED@ +-DISTCHECK_CONFIGURE_FLAGS = @DISTCHECK_CONFIGURE_FLAGS@ + DOC_USER_FORMATS = @DOC_USER_FORMATS@ + ECHO = @ECHO@ + ECHO_C = @ECHO_C@ +@@ -158,6 +157,7 @@ + GNOME_CFLAGS = @GNOME_CFLAGS@ + GNOME_LIBS = @GNOME_LIBS@ + GREP = @GREP@ ++GTKDOC_CHECK = @GTKDOC_CHECK@ + GTKPRINT_CFLAGS = @GTKPRINT_CFLAGS@ + GTKPRINT_LIBS = @GTKPRINT_LIBS@ + GTK_CFLAGS = @GTK_CFLAGS@ +@@ -216,6 +216,7 @@ + MKINSTALLDIRS = @MKINSTALLDIRS@ + MSGFMT = @MSGFMT@ + MSGFMT_OPTS = @MSGFMT_OPTS@ ++MSGMERGE = @MSGMERGE@ + NO_STRICT_ALIASING_CFLAGS = @NO_STRICT_ALIASING_CFLAGS@ + OBJEXT = @OBJEXT@ + OMF_DIR = @OMF_DIR@ +--- epiphany-browser-2.21.90.orig/lib/egg/Makefile.in ++++ epiphany-browser-2.21.90/lib/egg/Makefile.in +@@ -121,7 +121,6 @@ + DESKTOP_FILE_PLUGIN_DEP_CFLAGS = @DESKTOP_FILE_PLUGIN_DEP_CFLAGS@ + DESKTOP_FILE_PLUGIN_DEP_LIBS = @DESKTOP_FILE_PLUGIN_DEP_LIBS@ + DISABLE_DEPRECATED = @DISABLE_DEPRECATED@ +-DISTCHECK_CONFIGURE_FLAGS = @DISTCHECK_CONFIGURE_FLAGS@ + DOC_USER_FORMATS = @DOC_USER_FORMATS@ + ECHO = @ECHO@ + ECHO_C = @ECHO_C@ +@@ -161,6 +160,7 @@ + GNOME_CFLAGS = @GNOME_CFLAGS@ + GNOME_LIBS = @GNOME_LIBS@ + GREP = @GREP@ ++GTKDOC_CHECK = @GTKDOC_CHECK@ + GTKPRINT_CFLAGS = @GTKPRINT_CFLAGS@ + GTKPRINT_LIBS = @GTKPRINT_LIBS@ + GTK_CFLAGS = @GTK_CFLAGS@ +@@ -219,6 +219,7 @@ + MKINSTALLDIRS = @MKINSTALLDIRS@ + MSGFMT = @MSGFMT@ + MSGFMT_OPTS = @MSGFMT_OPTS@ ++MSGMERGE = @MSGMERGE@ + NO_STRICT_ALIASING_CFLAGS = @NO_STRICT_ALIASING_CFLAGS@ + OBJEXT = @OBJEXT@ + OMF_DIR = @OMF_DIR@ +--- epiphany-browser-2.21.90.orig/ltmain.sh ++++ epiphany-browser-2.21.90/ltmain.sh +@@ -43,7 +43,7 @@ + + PROGRAM=ltmain.sh + PACKAGE=libtool +-VERSION="1.5.24 Debian 1.5.24-1ubuntu1" ++VERSION="1.5.24 Debian 1.5.24-2ubuntu2" + TIMESTAMP=" (1.1220.2.456 2007/06/24 02:25:32)" + + # Be Bourne compatible (taken from Autoconf:_AS_BOURNE_COMPATIBLE). +--- epiphany-browser-2.21.90.orig/intltool-merge.in ++++ epiphany-browser-2.21.90/intltool-merge.in +@@ -35,7 +35,7 @@ + ## Release information + my $PROGRAM = "intltool-merge"; + my $PACKAGE = "intltool"; +-my $VERSION = "0.36.1"; ++my $VERSION = "0.37.0"; + + ## Loaded modules + use strict; +@@ -61,6 +61,7 @@ + my $SCHEMAS_STYLE_ARG = 0; + my $RFC822DEB_STYLE_ARG = 0; + my $QUOTED_STYLE_ARG = 0; ++my $QUOTEDXML_STYLE_ARG = 0; + my $QUIET_ARG = 0; + my $PASS_THROUGH_ARG = 0; + my $UTF8_ARG = 0; +@@ -81,6 +82,7 @@ + "schemas-style|s" => \$SCHEMAS_STYLE_ARG, + "rfc822deb-style|r" => \$RFC822DEB_STYLE_ARG, + "quoted-style" => \$QUOTED_STYLE_ARG, ++ "quotedxml-style" => \$QUOTEDXML_STYLE_ARG, + "pass-through|p" => \$PASS_THROUGH_ARG, + "utf8|u" => \$UTF8_ARG, + "multiple-output|m" => \$MULTIPLE_OUTPUT, +@@ -148,7 +150,7 @@ + &utf8_sanity_check; + &preparation; + &print_message; +- &keys_merge_translations; ++ &keys_merge_translations; + &finalize; + } + elsif ($DESKTOP_STYLE_ARG && @ARGV > 2) +@@ -174,12 +176,12 @@ + &rfc822deb_merge_translations; + &finalize; + } +-elsif ($QUOTED_STYLE_ARG && @ARGV > 2) ++elsif (($QUOTED_STYLE_ARG || $QUOTEDXML_STYLE_ARG) && @ARGV > 2) + { + &utf8_sanity_check; + &preparation; + &print_message; +- "ed_merge_translations; ++ "ed_merge_translations($QUOTEDXML_STYLE_ARG); + &finalize; + } + else +@@ -219,6 +221,7 @@ + -s, --schemas-style includes translations in the schemas style + -r, --rfc822deb-style includes translations in the RFC822 style + --quoted-style includes translations in the quoted string style ++ --quotedxml-style includes translations in the quoted xml string style + -x, --xml-style includes translations in the standard xml style + + Other options: +@@ -292,10 +295,9 @@ + { + next if /^#/; + +- if (/([-a-zA-Z_@.]+)\n/) ++ for my $lang (split) + { +- my $lang = $1; +- ++ chomp ($lang); + my $po_file = $PO_DIR . "/" . $lang . ".po"; + if (-e $po_file) { + $po_files_by_lang{$lang} = $po_file; +@@ -576,6 +578,7 @@ + return "&" if $_ == 38; + return "'" if $_ == 39; + return "<" if $_ == 60; ++ return ">" if $_ == 62; + return chr $_; + } + +@@ -1076,43 +1079,74 @@ + close OUTPUT; + print "CREATED $lang/$OUTFILE\n" unless $QUIET_ARG; + } +- } +- open OUTPUT, ">$OUTFILE" or die "Cannot open $OUTFILE: $!\n"; +- binmode (OUTPUT) if $^O eq 'MSWin32'; +- my $tree = readXml($FILE); +- print_header($FILE, \*OUTPUT); +- parseTree(\*OUTPUT, $tree); +- close OUTPUT; +- print "CREATED $OUTFILE\n" unless $QUIET_ARG; ++ if ( ! -d "C" ) { ++ mkdir "C" or -d "C" or die "Cannot create subdirectory C: $!\n"; ++ } ++ open OUTPUT, ">C/$OUTFILE" or die "Cannot open C/$OUTFILE: $!\n"; ++ binmode (OUTPUT) if $^O eq 'MSWin32'; ++ my $tree = readXml($FILE); ++ print_header($FILE, \*OUTPUT); ++ parseTree(\*OUTPUT, $tree); ++ close OUTPUT; ++ print "CREATED C/$OUTFILE\n" unless $QUIET_ARG; ++ } else { ++ open OUTPUT, ">$OUTFILE" or die "Cannot open $OUTFILE: $!\n"; ++ binmode (OUTPUT) if $^O eq 'MSWin32'; ++ my $tree = readXml($FILE); ++ print_header($FILE, \*OUTPUT); ++ parseTree(\*OUTPUT, $tree); ++ close OUTPUT; ++ print "CREATED $OUTFILE\n" unless $QUIET_ARG; ++ } + } + +-sub keys_merge_translations ++sub keys_merge_translation + { +- open INPUT, "<${FILE}" or die; +- open OUTPUT, ">${OUTFILE}" or die; ++ my ($lang) = @_; ++ ++ if ( ! -d $lang && $MULTIPLE_OUTPUT) ++ { ++ mkdir $lang or -d $lang or die "Cannot create subdirectory $lang: $!\n"; ++ } ++ ++ open INPUT, "<${FILE}" or die "Cannot open ${FILE}: $!\n"; ++ open OUTPUT, ">$lang/$OUTFILE" or die "Cannot open $lang/$OUTFILE: $!\n"; + binmode (OUTPUT) if $^O eq 'MSWin32'; + +- while () ++ while () + { +- if (s/^(\s*)_(\w+=(.*))/$1$2/) ++ if (s/^(\s*)_(\w+=(.*))/$1$2/) + { +- my $string = $3; ++ my $string = $3; + +- print OUTPUT; ++ if (!$MULTIPLE_OUTPUT) ++ { ++ print OUTPUT; + +- my $non_translated_line = $_; ++ my $non_translated_line = $_; + +- for my $lang (sort keys %po_files_by_lang) ++ for my $lang (sort keys %po_files_by_lang) ++ { ++ my $translation = $translations{$lang, $string}; ++ next if !$translation; ++ ++ $_ = $non_translated_line; ++ s/(\w+)=.*/[$lang]$1=$translation/; ++ print OUTPUT; ++ } ++ } ++ else + { +- my $translation = $translations{$lang, $string}; +- next if !$translation; ++ my $non_translated_line = $_; ++ my $translation = $translations{$lang, $string}; ++ $translation = $string if !$translation; + + $_ = $non_translated_line; +- s/(\w+)=.*/[$lang]$1=$translation/; ++ s/(\w+)=.*/$1=$translation/; + print OUTPUT; + } +- } +- else ++ } ++ else + { + print OUTPUT; + } +@@ -1120,6 +1154,24 @@ + + close OUTPUT; + close INPUT; ++ ++ print "CREATED $lang/$OUTFILE\n" unless $QUIET_ARG; ++} ++ ++sub keys_merge_translations ++{ ++ if ($MULTIPLE_OUTPUT) ++ { ++ for my $lang (sort keys %po_files_by_lang) ++ { ++ keys_merge_translation ($lang); ++ } ++ keys_merge_translation ("C"); ++ } ++ else ++ { ++ keys_merge_translation ("."); ++ } + } + + sub desktop_merge_translations +@@ -1415,19 +1467,22 @@ + + sub quoted_translation + { +- my ($lang, $string) = @_; ++ my ($xml_mode, $lang, $string) = @_; + ++ $string = entity_decode($string) if $xml_mode; + $string =~ s/\\\"/\"/g; + + my $translation = $translations{$lang, $string}; + $translation = $string if !$translation; +- ++ $translation = entity_encode($translation) if $xml_mode; + $translation =~ s/\"/\\\"/g; + return $translation + } + + sub quoted_merge_translations + { ++ my ($xml_mode) = @_; ++ + if (!$MULTIPLE_OUTPUT) { + print "Quoted only supports Multiple Output.\n"; + exit(1); +@@ -1442,7 +1497,7 @@ + binmode (OUTPUT) if $^O eq 'MSWin32'; + while () + { +- s/\"(([^\"]|\\\")*[^\\\"])\"/"\"" . "ed_translation($lang, $1) . "\""/ge; ++ s/\"(([^\"]|\\\")*[^\\\"])\"/"\"" . "ed_translation($xml_mode, $lang, $1) . "\""/ge; + print OUTPUT; + } + close OUTPUT; +--- epiphany-browser-2.21.90.orig/Makefile.in ++++ epiphany-browser-2.21.90/Makefile.in +@@ -114,16 +114,6 @@ + DESKTOP_FILE_PLUGIN_DEP_CFLAGS = @DESKTOP_FILE_PLUGIN_DEP_CFLAGS@ + DESKTOP_FILE_PLUGIN_DEP_LIBS = @DESKTOP_FILE_PLUGIN_DEP_LIBS@ + DISABLE_DEPRECATED = @DISABLE_DEPRECATED@ +-DISTCHECK_CONFIGURE_FLAGS = \ +- --enable-python \ +- --enable-zeroconf \ +- --enable-desktop-file-plugin \ +- --enable-certificate-manager \ +- --enable-gtk-doc \ +- --disable-schemas-install \ +- --disable-scrollkeeper \ +- --with-gecko=$(GECKO) +- + DOC_USER_FORMATS = @DOC_USER_FORMATS@ + ECHO = @ECHO@ + ECHO_C = @ECHO_C@ +@@ -163,6 +153,7 @@ + GNOME_CFLAGS = @GNOME_CFLAGS@ + GNOME_LIBS = @GNOME_LIBS@ + GREP = @GREP@ ++GTKDOC_CHECK = @GTKDOC_CHECK@ + GTKPRINT_CFLAGS = @GTKPRINT_CFLAGS@ + GTKPRINT_LIBS = @GTKPRINT_LIBS@ + GTK_CFLAGS = @GTK_CFLAGS@ +@@ -221,6 +212,7 @@ + MKINSTALLDIRS = @MKINSTALLDIRS@ + MSGFMT = @MSGFMT@ + MSGFMT_OPTS = @MSGFMT_OPTS@ ++MSGMERGE = @MSGMERGE@ + NO_STRICT_ALIASING_CFLAGS = @NO_STRICT_ALIASING_CFLAGS@ + OBJEXT = @OBJEXT@ + OMF_DIR = @OMF_DIR@ +@@ -351,6 +343,16 @@ + gnome-doc-utils.make \ + $(NULL) + ++DISTCHECK_CONFIGURE_FLAGS = \ ++ --enable-python \ ++ --enable-zeroconf \ ++ --enable-desktop-file-plugin \ ++ --enable-certificate-manager \ ++ --enable-gtk-doc \ ++ --disable-schemas-install \ ++ --disable-scrollkeeper \ ++ --with-gecko=$(GECKO) ++ + + # Ignore gtk theme cache files on distcheck + distuninstallcheck_listfiles = find . -type f -print | grep -v 'icon-theme.cache' --- epiphany-browser-2.21.90.orig/debian/patches/series +++ epiphany-browser-2.21.90/debian/patches/series @@ -0,0 +1,21 @@ +00_browser_wrapper_path.patch +01_bookmarks_menu.patch +02_ac_init.patch +#03_dbus.patch +#04_move_tabs.patch +05_libexecdir.patch +06_lpi.patch +06_ssl_weak_ciphers.patch +07_bookmarks.patch +#08_load_on_new_tab.patch +08_localized_startup_page.patch +09_download_dialog.patch -p0 +10_url_double-click.patch +#11_useragent-weasel.patch +12_gxx43.patch +98_xulrunner1.9.patch +#98_xulrunner1.9_build_changes.patch +98a_nsipromptservice2_workaround.patch +98_ephy-boot-xul-early.patch +#98b_gtk_nss_dialog_missing_symbol.patch +99_autoreconf.patch --- epiphany-browser-2.21.90.orig/debian/patches/08_localized_startup_page.patch +++ epiphany-browser-2.21.90/debian/patches/08_localized_startup_page.patch @@ -0,0 +1,212 @@ +Index: epiphany-browser-2.21.4/src/ephy-home-action.c +=================================================================== +--- epiphany-browser-2.21.4.orig/src/ephy-home-action.c 2007-09-12 20:35:23.000000000 +0200 ++++ epiphany-browser-2.21.4/src/ephy-home-action.c 2007-12-17 10:49:07.000000000 +0100 +@@ -156,16 +156,95 @@ + } + } + ++static char * ++escape_homepage (char *homepage, char *languages) ++{ ++ const char *inptr, *start; ++ GString *page; ++ ++ languages = g_strdelimit (languages, ".@:", '\0'); ++ ++ page = g_string_new (NULL); ++ ++ start = inptr = homepage; ++ while ((inptr = strchr (inptr, '%')) != NULL) { ++ g_string_append_len (page, start, inptr - start); ++ inptr++; ++ switch (*inptr) { ++ case 'l': ++ g_string_append (page, languages); ++ break; ++ case '%': ++ g_string_append_c (page, '%'); ++ break; ++ default: ++ g_string_append_c (page, '%'); ++ if (*inptr) ++ g_string_append_c (page, *inptr); ++ break; ++ } ++ ++ if (*inptr) ++ inptr++; ++ start = inptr; ++ } ++ ++ g_string_append (page, start); ++ ++ return g_string_free (page, FALSE); ++} ++ + static void + ephy_home_action_activate (GtkAction *action) + { + char *action_name; + char *address; ++ const char * const * languages; ++ char *homepage; + + g_object_get (G_OBJECT (action), "name", &action_name, NULL); + + address = eel_gconf_get_string (CONF_GENERAL_HOMEPAGE); + ++ if (address != NULL && address[0] != '\0' && (*address == '/' || !strncmp(address, "file://", 7))) ++ { ++ languages = g_get_language_names (); ++ if (languages) ++ { ++ int i; ++ gboolean page_set = FALSE; ++ ++ for (i = 0; languages[i] != NULL; i++) ++ { ++ if (page_set) ++ break; ++ ++ homepage = escape_homepage (address, languages[i]); ++ ++ if (!strncmp(address, "file://", 7)) ++ { ++ char *path; ++ path = homepage + 7; ++ ++ if (g_file_test (path, G_FILE_TEST_EXISTS)) ++ page_set = TRUE; ++ ++ } ++ else if (g_file_test (homepage, G_FILE_TEST_EXISTS)) ++ page_set = TRUE; ++ } ++ ++ if (!page_set) ++ homepage = escape_homepage (address, "C"); ++ } ++ else ++ homepage = escape_homepage (address, "C"); ++ ++ g_free (address); ++ address = g_strdup (homepage); ++ g_free (homepage); ++ } ++ + action_name_association (action, action_name, address, FALSE); + + g_free (address); +Index: epiphany-browser-2.21.4/src/ephy-shell.c +=================================================================== +--- epiphany-browser-2.21.4.orig/src/ephy-shell.c 2007-11-16 16:09:42.000000000 +0100 ++++ epiphany-browser-2.21.4/src/ephy-shell.c 2007-12-17 10:46:49.000000000 +0100 +@@ -26,6 +26,7 @@ + #include + #include + #include ++#include + + #include "ephy-shell.h" + #include "ephy-type-builtins.h" +@@ -394,6 +395,44 @@ + return ephy_shell; + } + ++static char * ++escape_homepage (char *homepage, char *languages) ++{ ++ const char *inptr, *start; ++ GString *page; ++ ++ languages = g_strdelimit (languages, ".@:", '\0'); ++ ++ page = g_string_new (NULL); ++ ++ start = inptr = homepage; ++ while ((inptr = strchr (inptr, '%')) != NULL) { ++ g_string_append_len (page, start, inptr - start); ++ inptr++; ++ switch (*inptr) { ++ case 'l': ++ g_string_append (page, languages); ++ break; ++ case '%': ++ g_string_append_c (page, '%'); ++ break; ++ default: ++ g_string_append_c (page, '%'); ++ if (*inptr) ++ g_string_append_c (page, *inptr); ++ break; ++ } ++ ++ if (*inptr) ++ inptr++; ++ start = inptr; ++ } ++ ++ g_string_append (page, start); ++ ++ return g_string_free (page, FALSE); ++} ++ + static gboolean + url_is_empty (const char *location) + { +@@ -411,7 +450,8 @@ + static gboolean + load_homepage (EphyEmbed *embed) + { +- char *home; ++ const char * const * languages; ++ char *homepage, *home; + gboolean is_empty; + + home = eel_gconf_get_string(CONF_GENERAL_HOMEPAGE); +@@ -422,6 +462,44 @@ + + home = g_strdup ("about:blank"); + } ++ else if (*home == '/' || !strncmp(home, "file://", 7)) ++ { ++ languages = g_get_language_names (); ++ if (languages) ++ { ++ int i; ++ gboolean page_set = FALSE; ++ ++ for (i = 0; languages[i] != NULL; i++) ++ { ++ if (page_set) ++ break; ++ ++ homepage = escape_homepage (home, languages[i]); ++ ++ if (!strncmp(home, "file://", 7)) ++ { ++ char *path; ++ path = homepage + 7; ++ ++ if (g_file_test (path, G_FILE_TEST_EXISTS)) ++ page_set = TRUE; ++ ++ } ++ else if (g_file_test (homepage, G_FILE_TEST_EXISTS)) ++ page_set = TRUE; ++ } ++ ++ if (!page_set) ++ homepage = escape_homepage (home, "C"); ++ } ++ else ++ homepage = escape_homepage (home, "C"); ++ ++ g_free (home); ++ home = g_strdup (homepage); ++ g_free (homepage); ++ } + + is_empty = url_is_empty (home); + --- epiphany-browser-2.21.90.orig/debian/patches/03_dbus.patch +++ epiphany-browser-2.21.90/debian/patches/03_dbus.patch @@ -0,0 +1,23 @@ +Index: epiphany-2.20.0/src/ephy-main.c +=================================================================== +--- epiphany-2.20.0.orig/src/ephy-main.c 2007-09-21 14:46:15.134076289 +0200 ++++ epiphany-2.20.0/src/ephy-main.c 2007-09-21 14:47:40.806958509 +0200 +@@ -624,11 +624,13 @@ + + if (!_ephy_dbus_startup (!private_instance, &error)) + { +- _ephy_dbus_release (); +- +- show_error_message (&error); +- +- exit (1); ++ GtkWidget *dialog = gtk_message_dialog_new (NULL, 0, ++ GTK_MESSAGE_WARNING, GTK_BUTTONS_OK, ++ "Epiphany could not connect to the session message bus. " ++ "Your default settings will not be available."); ++ gtk_dialog_run (GTK_DIALOG (dialog)); ++ gtk_widget_destroy (dialog); ++ private_instance = TRUE; + } + + /* If we're remoting, no need to start up any further services, --- epiphany-browser-2.21.90.orig/debian/patches/04_move_tabs.patch +++ epiphany-browser-2.21.90/debian/patches/04_move_tabs.patch @@ -0,0 +1,13 @@ +Index: epiphany-browser-2.18.0/src/ephy-notebook.c +=================================================================== +--- epiphany-browser-2.18.0.orig/src/ephy-notebook.c 2007-03-06 12:31:28.000000000 +0000 ++++ epiphany-browser-2.18.0/src/ephy-notebook.c 2007-03-11 20:57:46.000000000 +0000 +@@ -58,7 +58,7 @@ + #define TOOLTIP_MAX_LENGTH 256 + + /* Until https://bugzilla.mozilla.org/show_bug.cgi?id=296002 is fixed */ +-#define KEEP_TAB_IN_SAME_TOPLEVEL ++#undef KEEP_TAB_IN_SAME_TOPLEVEL + + #define EPHY_NOTEBOOK_GET_PRIVATE(object)(G_TYPE_INSTANCE_GET_PRIVATE ((object), EPHY_TYPE_NOTEBOOK, EphyNotebookPrivate)) + --- epiphany-browser-2.21.90.orig/debian/patches/06_ssl_weak_ciphers.patch +++ epiphany-browser-2.21.90/debian/patches/06_ssl_weak_ciphers.patch @@ -0,0 +1,11 @@ +Index: epiphany-2.20.0/data/default-prefs-common.js +=================================================================== +--- epiphany-2.20.0.orig/data/default-prefs-common.js 2007-08-27 22:19:01.000000000 +0200 ++++ epiphany-2.20.0/data/default-prefs-common.js 2007-09-21 14:29:58.022393868 +0200 +@@ -163,3 +163,6 @@ + // set to true for parity with gtk entries + pref("bidi.edit.delete_immediately", true); + ++// enable weak SSL ciphers, as Epiphany warns about them anyway ++pref("security.ssl3.rsa_rc4_40_md5", true); ++pref("security.ssl3.rsa_rc2_40_md5", true); --- epiphany-browser-2.21.90.orig/debian/patches/12_gxx43.patch +++ epiphany-browser-2.21.90/debian/patches/12_gxx43.patch @@ -0,0 +1,26 @@ +only in patch2: +unchanged: +--- epiphany-browser-2.21.4.orig/embed/mozilla/EphyBrowser.h ++++ epiphany-browser-2.21.4/embed/mozilla/EphyBrowser.h +@@ -187,7 +187,7 @@ + + nsresult LoadURI(const char *aURI, + PRUint32 aLoadFlags = nsIWebNavigation::LOAD_FLAGS_NONE, +- nsIURI *aURI = nsnull); ++ nsIURI *aReferrer = nsnull); + + EphyEmbedDocumentType GetDocumentType (); + +only in patch2: +unchanged: +--- epiphany-browser-2.21.4.orig/embed/mozilla/mozilla-x509-cert.h ++++ epiphany-browser-2.21.4/embed/mozilla/mozilla-x509-cert.h +@@ -56,7 +56,7 @@ + + MozillaX509Cert *mozilla_x509_cert_new (nsIX509Cert *aMozCert); + +-nsresult mozilla_x509_cert_get_mozilla_cert (MozillaX509Cert *cert, nsIX509Cert **cert); ++nsresult mozilla_x509_cert_get_mozilla_cert (MozillaX509Cert *cert, nsIX509Cert **aCert); + + G_END_DECLS + --- epiphany-browser-2.21.90.orig/debian/patches/09_download_dialog.patch +++ epiphany-browser-2.21.90/debian/patches/09_download_dialog.patch @@ -0,0 +1,147 @@ +Index: embed/mozilla/ContentHandler.cpp +=================================================================== +--- embed/mozilla/ContentHandler.cpp.orig 2007-08-27 22:19:02.000000000 +0200 ++++ embed/mozilla/ContentHandler.cpp 2007-09-21 14:30:06.194859590 +0200 +@@ -336,8 +336,11 @@ + + gtk_dialog_add_button (GTK_DIALOG (dialog), + GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL); +- gtk_dialog_add_button (GTK_DIALOG (dialog), +- action_label, mAction); ++ if (mAction != CONTENT_ACTION_NONE) ++ { ++ gtk_dialog_add_button (GTK_DIALOG (dialog), ++ action_label, mAction); ++ } + + gtk_window_set_icon_name (GTK_WINDOW (dialog), EPHY_STOCK_EPHY); + +@@ -385,20 +388,16 @@ + } + + if (auto_downloads) +- { +- mAction = CONTENT_ACTION_OPEN; +- } ++ mAction = mHelperApp ? CONTENT_ACTION_OPEN : CONTENT_ACTION_DOWNLOAD; + else +- { +- mAction = CONTENT_ACTION_OPEN_TMP; +- } ++ mAction = mHelperApp ? CONTENT_ACTION_OPEN_TMP : CONTENT_ACTION_SAVEAS; + +- if (!mHelperApp || mPermission != EPHY_MIME_PERMISSION_SAFE) ++ if (mPermission != EPHY_MIME_PERMISSION_SAFE) + { +- mAction = CONTENT_ACTION_DOWNLOAD; ++ mAction = auto_downloads ? CONTENT_ACTION_DOWNLOAD : CONTENT_ACTION_NONE; ++ MIMEConfirmAction (); + } +- +- if (!auto_downloads || mAction == CONTENT_ACTION_DOWNLOAD) ++ else if (mAction == CONTENT_ACTION_OPEN_TMP) + { + MIMEConfirmAction (); + } +Index: data/glade/prefs-dialog.glade +=================================================================== +--- data/glade/prefs-dialog.glade.orig 2007-08-27 22:19:01.000000000 +0200 ++++ data/glade/prefs-dialog.glade 2007-09-21 14:30:06.198859818 +0200 +@@ -303,6 +303,25 @@ + 6 + + ++ ++ True ++ True ++ A_utomatically download and open files ++ True ++ GTK_RELIEF_NORMAL ++ True ++ False ++ False ++ True ++ ++ ++ 0 ++ False ++ False ++ ++ ++ ++ + + True + False +@@ -343,25 +362,6 @@ + True + + +- +- +- +- True +- True +- A_utomatically download and open files +- True +- GTK_RELIEF_NORMAL +- True +- False +- False +- True +- +- +- 0 +- False +- False +- +- + + + +Index: src/prefs-dialog.c +=================================================================== +--- src/prefs-dialog.c.orig 2007-08-27 22:18:55.000000000 +0200 ++++ src/prefs-dialog.c 2007-09-21 14:30:06.198859818 +0200 +@@ -391,6 +391,13 @@ + } + + static void ++automatic_downloads_toggled (GtkToggleButton *button, ++ GtkWidget *widget) ++{ ++ g_object_set (widget, "sensitive", gtk_toggle_button_get_active (button), NULL); ++} ++ ++static void + setup_font_combo (EphyDialog *dialog, + const char *type, + const char *code, +@@ -1525,6 +1532,7 @@ + EphyDialog *dialog = EPHY_DIALOG (pd); + EphyEncodings *encodings; + GtkWidget *window, *curr_button, *blank_button; ++ GtkWidget *automatic_downloads_checkbutton, *download_button_hbox; + GtkWidget *clear_cache_button, *font_prefs_button; + GtkWidget *css_checkbox, *css_edit_box, *css_edit_button, *css_container; + gboolean sensitive; +@@ -1545,6 +1553,8 @@ + properties[WINDOW_PROP].id, &window, + properties[HOMEPAGE_CURRENT_PROP].id, &curr_button, + properties[HOMEPAGE_BLANK_PROP].id, &blank_button, ++ properties[AUTO_OPEN_PROP].id, &automatic_downloads_checkbutton, ++ properties[DOWNLOAD_PATH_HBOX_PROP].id, &download_button_hbox, + properties[FONT_PREFS_BUTTON_PROP].id, &font_prefs_button, + properties[CSS_CHECKBOX_PROP].id, &css_checkbox, + properties[CSS_EDIT_BOX_PROP].id, &css_edit_box, +@@ -1568,6 +1578,10 @@ + gtk_widget_set_sensitive (curr_button, sensitive); + gtk_widget_set_sensitive (blank_button, sensitive); + ++ automatic_downloads_toggled (GTK_TOGGLE_BUTTON (automatic_downloads_checkbutton), download_button_hbox); ++ g_signal_connect (automatic_downloads_checkbutton, "toggled", ++ G_CALLBACK (automatic_downloads_toggled), download_button_hbox); ++ + g_signal_connect (font_prefs_button, "clicked", + G_CALLBACK (font_prefs_button_clicked_cb), dialog); + --- epiphany-browser-2.21.90.orig/debian/patches/11_useragent-weasel.patch +++ epiphany-browser-2.21.90/debian/patches/11_useragent-weasel.patch @@ -0,0 +1,18 @@ +Index: epiphany-2.18.3/data/weasel-ua-pref.js.in +=================================================================== +--- epiphany-2.18.3.orig/data/weasel-ua-pref.js.in 2007-07-04 22:20:08.250260516 +0200 ++++ epiphany-2.18.3/data/weasel-ua-pref.js.in 2007-07-04 22:23:24.133423262 +0200 +@@ -1,6 +1,7 @@ +-// Add "Firefox/@WEASEL_UA_VERSION@" to the UA. This fixes +-// [https://bugzilla.mozilla.org/show_bug.cgi?id=334967] +-// Same as Camino [https://bugzilla.mozilla.org/show_bug.cgi?id=384721] and +-// IceApe [https://bugzilla.mozilla.org/show_bug.cgi?id=386113] do. +-// Also see discussion on [https://bugzilla.mozilla.org/show_bug.cgi?id=385999]. +-pref("general.useragent.extra.firefox", "Firefox/@WEASEL_UA_VERSION@"); ++ ++// The following breaks the UA by adding Firefox to it, but it also ++// fixes interaction with poorly written websites with broken UA checks. ++// See https://bugzilla.mozilla.org/show_bug.cgi?id=384721#c6 to ++// understand why this is a bad idea and isn't enabled in Debian. ++// ++// pref("general.useragent.extra.firefox", "Firefox/@WEASEL_UA_VERSION@"); --- epiphany-browser-2.21.90.orig/debian/patches/06_lpi.patch +++ epiphany-browser-2.21.90/debian/patches/06_lpi.patch @@ -0,0 +1,45 @@ +diff -Nur epiphany-browser-2.15.4/configure.ac epiphany-browser-2.15.4.new/configure.ac +--- epiphany-browser-2.15.4/configure.ac 2006-07-11 10:32:09.000000000 +0200 ++++ epiphany-browser-2.15.4.new/configure.ac 2006-07-11 10:32:36.000000000 +0200 +@@ -95,6 +95,7 @@ + libxslt >= $LIBXSLT_REQUIRED + libgnome-2.0 >= $LIBGNOME_REQUIRED + libgnomeui-2.0 >= $LIBGNOMEUI_REQUIRED ++ launchpad-integration + libglade-2.0 >= $LIBGLADE_REQUIRED \ + gnome-vfs-2.0 >= $LIBGNOMEVFS_REQUIRED + gnome-vfs-module-2.0 +diff -Nur epiphany-browser-2.15.4/data/ui/epiphany-ui.xml epiphany-browser-2.15.4.new/data/ui/epiphany-ui.xml +--- epiphany-browser-2.15.4/data/ui/epiphany-ui.xml 2006-05-05 19:27:30.000000000 +0200 ++++ epiphany-browser-2.15.4.new/data/ui/epiphany-ui.xml 2006-07-11 10:32:17.000000000 +0200 +@@ -101,6 +101,9 @@ + + + ++ ++ ++ + + + +diff -Nur epiphany-browser-2.15.4/src/ephy-window.c epiphany-browser-2.15.4.new/src/ephy-window.c +--- epiphany-browser-2.15.4/src/ephy-window.c 2006-07-10 21:28:01.000000000 +0200 ++++ epiphany-browser-2.15.4.new/src/ephy-window.c 2006-07-11 10:32:17.000000000 +0200 +@@ -66,6 +66,7 @@ + #include + #include + #include ++#include + + #ifdef HAVE_X11_XF86KEYSYM_H + #include +@@ -3125,6 +3126,9 @@ + } + #endif + ++ launchpad_integration_add_ui (window->priv->manager, ++ "ui/menubar/HelpMenu/LaunchpadItems"); ++ + /* Initialize the menus */ + priv->tabs_menu = ephy_tabs_menu_new (window); + priv->enc_menu = ephy_encoding_menu_new (window); --- epiphany-browser-2.21.90.orig/debian/patches/02_ac_init.patch +++ epiphany-browser-2.21.90/debian/patches/02_ac_init.patch @@ -0,0 +1,13 @@ +Index: epiphany-browser-2.21.4/configure.ac +=================================================================== +--- epiphany-browser-2.21.4.orig/configure.ac 2007-12-16 14:25:57.000000000 +0100 ++++ epiphany-browser-2.21.4/configure.ac 2007-12-17 10:43:57.000000000 +0100 +@@ -24,7 +24,7 @@ + # This can be either "trunk" or "branches/gnome-x-y" + m4_define([epiphany_branch],["trunk"]) + +-AC_INIT([GNOME Web Browser],[epiphany_version],[http://bugzilla.gnome.org/enter_bug.cgi?product=epiphany],[epiphany]) ++AC_INIT([GNOME Web Browser],[epiphany_version],[http://bugzilla.gnome.org/enter_bug.cgi?product=epiphany],[epiphany-browser]) + + GNOME_COMMON_INIT + --- epiphany-browser-2.21.90.orig/debian/patches/00_browser_wrapper_path.patch +++ epiphany-browser-2.21.90/debian/patches/00_browser_wrapper_path.patch @@ -0,0 +1,27 @@ +Index: epiphany-2.20.0/data/bme.desktop.in.in +=================================================================== +--- epiphany-2.20.0.orig/data/bme.desktop.in.in 2007-08-27 22:19:01.000000000 +0200 ++++ epiphany-2.20.0/data/bme.desktop.in.in 2007-09-21 14:26:35.018825354 +0200 +@@ -3,7 +3,7 @@ + _Name=Epiphany Web Bookmarks + _GenericName=Web Bookmarks + _Comment=Browse and organize your bookmarks +-Exec=epiphany --bookmarks-editor ++Exec=epiphany-browser --bookmarks-editor + StartupNotify=true + Terminal=false + Type=Application +Index: epiphany-2.20.0/data/epiphany.desktop.in.in +=================================================================== +--- epiphany-2.20.0.orig/data/epiphany.desktop.in.in 2007-08-27 22:19:01.000000000 +0200 ++++ epiphany-2.20.0/data/epiphany.desktop.in.in 2007-09-21 14:27:40.254542926 +0200 +@@ -3,7 +3,8 @@ + _Name=Epiphany Web Browser + _GenericName=Web Browser + _Comment=Browse the web +-Exec=epiphany %U ++Exec=epiphany-browser %U ++TryExec=/usr/bin/epiphany-browser + StartupNotify=true + Terminal=false + Type=Application --- epiphany-browser-2.21.90.orig/debian/patches/01_bookmarks_menu.patch +++ epiphany-browser-2.21.90/debian/patches/01_bookmarks_menu.patch @@ -0,0 +1,12 @@ +Index: epiphany-2.20.0/data/bme.desktop.in.in +=================================================================== +--- epiphany-2.20.0.orig/data/bme.desktop.in.in 2007-09-21 14:26:35.018825354 +0200 ++++ epiphany-2.20.0/data/bme.desktop.in.in 2007-09-21 14:28:35.273678287 +0200 +@@ -8,6 +8,7 @@ + Terminal=false + Type=Application + Icon=epiphany-bookmarks ++NoDisplay=true + X-GNOME-Bugzilla-Bugzilla=GNOME + X-GNOME-Bugzilla-Product=epiphany + X-GNOME-Bugzilla-Component=BugBuddyBugs --- epiphany-browser-2.21.90.orig/debian/patches/98a_nsipromptservice2_workaround.patch +++ epiphany-browser-2.21.90/debian/patches/98a_nsipromptservice2_workaround.patch @@ -0,0 +1,303 @@ +Index: embed/mozilla/EphyPromptService.cpp +=================================================================== +--- a/embed/mozilla/EphyPromptService.cpp (revision 7834) ++++ b/embed/mozilla/EphyPromptService.cpp (working copy) +@@ -31,6 +31,7 @@ + #include + #include + #include ++#include + + #include "ephy-embed-shell.h" + #include "ephy-gui.h" +@@ -41,6 +42,14 @@ + #include "EphyUtils.h" + + #include "EphyPromptService.h" ++#include "nsIChannel.h" ++#include "nsIProxiedChannel.h" ++#include "nsIProxyInfo.h" ++#include "nsNetCID.h" ++#include "nsIURI.h" ++#include "nsNetUtil.h" ++#include "nsIIDNService.h" ++#include "nsIAuthInformation.h" + + #define TIMEOUT 1000 /* ms */ + #define TIMEOUT_DATA_KEY "timeout" +@@ -645,11 +654,11 @@ + /* FIXME: needs THREADSAFE? */ + #if HAVE_NSINONBLOCKINGALERTSERVICE_H + NS_IMPL_ISUPPORTS2 (EphyPromptService, +- nsIPromptService, ++ nsIPromptService2, + nsINonBlockingAlertService) + #else + NS_IMPL_ISUPPORTS1 (EphyPromptService, +- nsIPromptService) ++ nsIPromptService2) + #endif + + EphyPromptService::EphyPromptService() +@@ -885,4 +894,216 @@ + return NS_OK; + } + ++static void ++NS_GetAuthHostPort(nsIChannel* aChannel, nsIAuthInformation* aAuthInfo, ++ PRBool machineProcessing, nsCString& host, PRInt32* port) ++{ ++ nsCOMPtr uri; ++ nsresult rv = aChannel->GetURI(getter_AddRefs(uri)); ++ if (NS_FAILED(rv)) ++ return; ++ ++ // Have to distinguish proxy auth and host auth here... ++ PRUint32 flags; ++ aAuthInfo->GetFlags(&flags); ++ if (flags & nsIAuthInformation::AUTH_PROXY) { ++ nsCOMPtr proxied(do_QueryInterface(aChannel)); ++ NS_ASSERTION(proxied, "proxy auth needs nsIProxiedChannel"); ++ ++ nsCOMPtr info; ++ proxied->GetProxyInfo(getter_AddRefs(info)); ++ NS_ASSERTION(info, "proxy auth needs nsIProxyInfo"); ++ ++ nsCAutoString idnhost; ++ info->GetHost(idnhost); ++ info->GetPort(port); ++ ++ if (machineProcessing) { ++ nsCOMPtr idnService = ++ do_GetService(NS_IDNSERVICE_CONTRACTID); ++ if (idnService) { ++ idnService->ConvertUTF8toACE(idnhost, host); ++ } else { ++ // Not much we can do here... ++ host = idnhost; ++ } ++ } else { ++ host = idnhost; ++ } ++ } else { ++ if (machineProcessing) { ++ uri->GetAsciiHost(host); ++ *port = NS_GetRealPort(uri); ++ } else { ++ uri->GetHost(host); ++ uri->GetPort(port); ++ } ++ } ++} ++ ++static nsresult ++MakeDialogText(nsIChannel* aChannel, nsIAuthInformation* aAuthInfo, ++ nsString& message) ++{ ++ nsresult rv; ++ nsCOMPtr bundleSvc = ++ do_GetService(NS_STRINGBUNDLE_CONTRACTID, &rv); ++ NS_ENSURE_SUCCESS(rv, rv); ++ ++ nsCOMPtr bundle; ++ rv = bundleSvc->CreateBundle("chrome://global/locale/prompts.properties", ++ getter_AddRefs(bundle)); ++ NS_ENSURE_SUCCESS(rv, rv); ++ ++ // figure out what message to display... ++ nsCAutoString host; ++ PRInt32 port; ++ NS_GetAuthHostPort(aChannel, aAuthInfo, PR_FALSE, host, &port); ++ ++ nsAutoString displayHost; ++ CopyUTF8toUTF16(host, displayHost); ++ ++ nsCOMPtr uri; ++ aChannel->GetURI(getter_AddRefs(uri)); ++ ++ nsCAutoString scheme; ++ uri->GetScheme(scheme); ++ ++ nsAutoString username; ++ aAuthInfo->GetUsername(username); ++ ++ PRUint32 flags; ++ aAuthInfo->GetFlags(&flags); ++ PRBool proxyAuth = (flags & nsIAuthInformation::AUTH_PROXY) != 0; ++ ++ nsAutoString realm; ++ aAuthInfo->GetRealm(realm); ++ ++ // Append the port if it was specified ++ if (port != -1) { ++ displayHost.Append(PRUnichar(':')); ++ displayHost.AppendInt(port); ++ } ++ ++ NS_NAMED_LITERAL_STRING(proxyText, "EnterUserPasswordForProxy"); ++ NS_NAMED_LITERAL_STRING(originText, "EnterUserPasswordForRealm"); ++ NS_NAMED_LITERAL_STRING(noRealmText, "EnterUserPasswordFor"); ++ NS_NAMED_LITERAL_STRING(passwordText, "EnterPasswordFor"); ++ ++ const PRUnichar *text; ++ if (proxyAuth) { ++ text = proxyText.get(); ++ } else { ++ text = originText.get(); ++ ++ // prepend "scheme://" ++ nsAutoString schemeU; ++ CopyASCIItoUTF16(scheme, schemeU); ++ schemeU.AppendLiteral("://"); ++ displayHost.Insert(schemeU, 0); ++ } ++ ++ const PRUnichar *strings[] = { realm.get(), displayHost.get() }; ++ PRUint32 count = NS_ARRAY_LENGTH(strings); ++ ++ if (flags & nsIAuthInformation::ONLY_PASSWORD) { ++ text = passwordText.get(); ++ strings[0] = username.get(); ++ } else if (!proxyAuth && realm.IsEmpty()) { ++ text = noRealmText.get(); ++ count--; ++ strings[0] = strings[1]; ++ } ++ ++ rv = bundle->FormatStringFromName(text, strings, count, getter_Copies(message)); ++ return rv; ++} ++ ++/* static */ nsresult ++EphyPromptService::PromptPasswordAdapter(nsIPromptService* aService, ++ nsIDOMWindow* aParent, ++ nsIChannel* aChannel, ++ PRUint32 aLevel, ++ nsIAuthInformation* aAuthInfo, ++ const PRUnichar* aCheckLabel, ++ PRBool* aCheckValue, ++ PRBool* retval) ++{ ++ // construct the message string ++ nsString message; ++ MakeDialogText(aChannel, aAuthInfo, message); ++ ++ nsAutoString defaultUser, defaultDomain, defaultPass; ++ aAuthInfo->GetUsername(defaultUser); ++ aAuthInfo->GetDomain(defaultDomain); ++ aAuthInfo->GetPassword(defaultPass); ++ ++ PRUint32 flags; ++ aAuthInfo->GetFlags(&flags); ++ ++ if ((flags & nsIAuthInformation::NEED_DOMAIN) && !defaultDomain.IsEmpty()) { ++ defaultDomain.Append(PRUnichar('\\')); ++ defaultUser.Insert(defaultDomain, 0); ++ } ++ ++ // NOTE: Allocation failure is not fatal here (just default to empty string ++ // if allocation fails) ++ PRUnichar *user = ToNewUnicode(defaultUser), ++ *pass = ToNewUnicode(defaultPass); ++ nsresult rv; ++ if (flags & nsIAuthInformation::ONLY_PASSWORD) ++ rv = aService->PromptPassword(aParent, nsnull, message.get(), ++ &pass, aCheckLabel, ++ aCheckValue, retval); ++ else ++ rv = aService->PromptUsernameAndPassword(aParent, nsnull, message.get(), ++ &user, &pass, aCheckLabel, ++ aCheckValue, retval); ++ ++ nsString userStr(user); ++ nsString passStr(pass); ++ aAuthInfo->SetUsername(userStr); ++ aAuthInfo->SetPassword(passStr); ++ ++ return rv; ++} ++ ++/* boolean promptAuth (in nsIDOMWindow aParent, in nsIChannel aChannel, in PRUint32 level, in nsIAuthInformation authInfo, in wstring checkboxLabel, inout boolean checkValue); */ ++NS_METHOD ++EphyPromptService::PromptAuth(nsIDOMWindow *aParent, ++ nsIChannel *aChannel, ++ PRUint32 level, ++ nsIAuthInformation *authInfo, ++ const PRUnichar *checkboxLabel, ++ PRBool *checkValue, ++ PRBool *_retval) ++{ ++ NS_ENSURE_ARG_POINTER (_retval); ++ NS_ENSURE_ARG_POINTER (authInfo); ++ ++ return EphyPromptService::PromptPasswordAdapter(this, ++ aParent, ++ aChannel, ++ level, ++ authInfo, ++ checkboxLabel, ++ checkValue, ++ _retval); ++} ++ ++/* nsICancelable asyncPromptAuth (in nsIDOMWindow aParent, in nsIChannel aChannel, in nsIAuthPromptCallback aCallback, in nsISupports aContext, in PRUint32 level, in nsIAuthInformation authInfo, in wstring checkboxLabel, inout boolean checkValue); */ ++NS_METHOD EphyPromptService::AsyncPromptAuth(nsIDOMWindow *aParent, ++ nsIChannel *aChannel, ++ nsIAuthPromptCallback *aCallback, ++ nsISupports *aContext, ++ PRUint32 level, ++ nsIAuthInformation *authInfo, ++ const PRUnichar *checkboxLabel, ++ PRBool *checkValue, ++ nsICancelable **_retval) ++{ ++ return NS_ERROR_NOT_IMPLEMENTED; ++} ++ ++ + #endif /* HAVE_NSINONBLOCKINGALERTSERVICE_H */ +Index: embed/mozilla/EphyPromptService.h +=================================================================== +--- a/embed/mozilla/EphyPromptService.h (revision 7834) ++++ b/embed/mozilla/EphyPromptService.h (working copy) +@@ -22,6 +22,7 @@ + #define EPHY_PROMPT_SERVICE_H + + #include ++#include + + #if HAVE_NSINONBLOCKINGALERTSERVICE_H + #include +@@ -34,7 +35,7 @@ + + #define EPHY_PROMPT_SERVICE_CLASSNAME "Epiphany Prompt Service" + +-class EphyPromptService : public nsIPromptService ++class EphyPromptService : public nsIPromptService2 + #if HAVE_NSINONBLOCKINGALERTSERVICE_H + , public nsINonBlockingAlertService + #endif +@@ -42,12 +43,23 @@ + public: + NS_DECL_ISUPPORTS + NS_DECL_NSIPROMPTSERVICE ++ NS_DECL_NSIPROMPTSERVICE2 + #if HAVE_NSINONBLOCKINGALERTSERVICE_H + NS_DECL_NSINONBLOCKINGALERTSERVICE + #endif + + EphyPromptService(); + virtual ~EphyPromptService(); ++ ++ protected: ++ static nsresult PromptPasswordAdapter(nsIPromptService* aService, ++ nsIDOMWindow* aParent, ++ nsIChannel* aChannel, ++ PRUint32 aLevel, ++ nsIAuthInformation* aAuthInfo, ++ const PRUnichar* aCheckLabel, ++ PRBool* aCheckValue, ++ PRBool* retval); + }; + + #endif /* EPHY_PROMPT_SERVICE_H */ --- epiphany-browser-2.21.90.orig/debian/patches/10_url_double-click.patch +++ epiphany-browser-2.21.90/debian/patches/10_url_double-click.patch @@ -0,0 +1,32 @@ +Index: epiphany-2.20.0/lib/widgets/ephy-location-entry.c +=================================================================== +--- epiphany-2.20.0.orig/lib/widgets/ephy-location-entry.c 2007-08-27 22:19:00.000000000 +0200 ++++ epiphany-2.20.0/lib/widgets/ephy-location-entry.c 2007-09-21 14:30:14.987360646 +0200 +@@ -353,18 +353,6 @@ + } + + static gboolean +-entry_button_press_cb (GtkWidget *entry, GdkEventButton *event, EphyLocationEntry *le) +-{ +- if (event->button == 1 && event->type == GDK_2BUTTON_PRESS) +- { +- ephy_location_entry_activate (le); +- return TRUE; +- } +- +- return FALSE; +-} +- +-static gboolean + entry_key_press_cb (GtkEntry *entry, + GdkEventKey *event, + EphyLocationEntry *lentry) +@@ -923,8 +911,6 @@ + G_CALLBACK (entry_key_press_after_cb), entry); + g_signal_connect_after (priv->icon_entry->entry, "activate", + G_CALLBACK (entry_activate_after_cb), entry); +- g_signal_connect (priv->icon_entry->entry, "button-press-event", +- G_CALLBACK (entry_button_press_cb), entry); + g_signal_connect (priv->icon_entry->entry, "changed", + G_CALLBACK (editable_changed_cb), entry); + g_signal_connect (priv->icon_entry->entry, "drag-motion", --- epiphany-browser-2.21.90.orig/debian/patches/98_ephy-boot-xul-early.patch +++ epiphany-browser-2.21.90/debian/patches/98_ephy-boot-xul-early.patch @@ -0,0 +1,12 @@ +Index: epiphany-browser-2.21.90/src/ephy-shell.c +=================================================================== +--- epiphany-browser-2.21.90/src/ephy-shell.c (revision 7927) ++++ epiphany-browser-2.21.90/src/ephy-shell.c (working copy) +@@ -248,6 +248,7 @@ + ephy_shell = shell; + g_object_add_weak_pointer (G_OBJECT(ephy_shell), + (gpointer *)ptr); ++ impl_get_embed_single(EPHY_EMBED_SHELL(shell)); + } + + static void --- epiphany-browser-2.21.90.orig/debian/patches/98b_gtk_nss_dialog_missing_symbol.patch +++ epiphany-browser-2.21.90/debian/patches/98b_gtk_nss_dialog_missing_symbol.patch @@ -0,0 +1,40 @@ +--- + embed/mozilla/GtkNSSDialogs.cpp | 15 +++++++++++++++ + 1 file changed, 15 insertions(+) + +Index: epiphany-browser-2.21.4/embed/mozilla/GtkNSSDialogs.cpp +=================================================================== +--- epiphany-browser-2.21.4.orig/embed/mozilla/GtkNSSDialogs.cpp ++++ epiphany-browser-2.21.4/embed/mozilla/GtkNSSDialogs.cpp +@@ -1551,16 +1551,31 @@ + static void + SelectionChangedCallback (GtkComboBox *combo, + GtkDialog *dialog) + { + int active = gtk_combo_box_get_active (combo); + 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_OK; ++} ++#endif ++ + /* void ChooseToken (in nsIInterfaceRequestor ctx, + [array, size_is (count)] in wstring tokenNameList, + in unsigned long count, + out wstring tokenName, + out boolean canceled); */ + NS_IMETHODIMP + GtkNSSDialogs::ChooseToken (nsIInterfaceRequestor *aContext, + const PRUnichar **tokenNameList, --- epiphany-browser-2.21.90.orig/debian/bug/control +++ epiphany-browser-2.21.90/debian/bug/control @@ -0,0 +1 @@ +report-with: epiphany-gecko epiphany-webkit --- epiphany-browser-2.21.90.orig/debian/epiphany.sh +++ epiphany-browser-2.21.90/debian/epiphany.sh @@ -0,0 +1,3 @@ +#! /bin/sh + +exec epiphany-browser "$@" --- epiphany-browser-2.21.90.orig/debian/copyright +++ epiphany-browser-2.21.90/debian/copyright @@ -0,0 +1,34 @@ +This package was debianized by Edd Dumbill on 14 Feb 2003. + +It was downloaded from + +Upstream authors: + Marco Pesenti Gritti + Xan Lopez + Christian Persch + Adam Hooper + Jean-François Rameau + Crispin Flowerday + +License: + + This package is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 2 of the License, or + (at your option) any later version. + + This package is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this package; if not, write to the Free Software + Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA + +On Debian systems, the complete text of the GNU General +Public License can be found in `/usr/share/common-licenses/GPL'. + +The Debian packaging is (C) 2003-2007, the Debian GNOME team + and +is licensed under the GPL, see above. --- epiphany-browser-2.21.90.orig/debian/epiphany-browser-data.gconf-defaults +++ epiphany-browser-2.21.90/debian/epiphany-browser-data.gconf-defaults @@ -0,0 +1,2 @@ +/apps/epiphany/general/homepage file:///usr/share/ubuntu-artwork/home/locales/index-%l.html +/apps/epiphany/web/language [system] --- epiphany-browser-2.21.90.orig/debian/watch +++ epiphany-browser-2.21.90/debian/watch @@ -0,0 +1,4 @@ +version=2 +http://download.gnome.org/sources/epiphany/([\d\.]+)[02468]/ \ + epiphany-(.*)\.tar\.gz \ + debian uupdate --- epiphany-browser-2.21.90.orig/debian/epiphany-gecko.prerm +++ epiphany-browser-2.21.90/debian/epiphany-gecko.prerm @@ -0,0 +1,12 @@ +#!/bin/sh +set -e + +if [ "$1" = "remove" ] || [ "$1" = "deconfigure" ] ; then + for alt in epiphany-browser x-www-browser gnome-www-browser; do + update-alternatives --remove $alt /usr/bin/epiphany-gecko + done +fi + +#DEBHELPER# + +exit 0 --- epiphany-browser-2.21.90.orig/debian/epiphany-browser.links +++ epiphany-browser-2.21.90/debian/epiphany-browser.links @@ -0,0 +1 @@ +/usr/share/man/man1/epiphany-browser.1.gz /usr/share/man/man1/epiphany.1.gz --- epiphany-browser-2.21.90.orig/debian/control +++ epiphany-browser-2.21.90/debian/control @@ -0,0 +1,114 @@ +Source: epiphany-browser +Section: gnome +Priority: optional +Maintainer: Ubuntu Desktop Team +XSBC-Original-Maintainer: Josselin Mouette +Uploaders: Debian GNOME Maintainers +Build-Depends: debhelper (>= 5), + pkg-config, + libglib2.0-dev (>= 2.13.4), + libgtk2.0-dev (>= 2.11.6), + libxml2-dev (>= 2.6.12), + libxslt1-dev (>= 1.1.7), + libglade2-dev (>= 2.3.1), + libgnome2-dev (>= 2.14.0), + libgnomeui-dev (>= 2.16.0-2), + libgconf2-dev, + libgnome-desktop-dev (>= 2.9.91), + libstartup-notification0-dev (>= 0.5), + libdbus-glib-1-dev (>= 0.60), + scrollkeeper, + gnome-pkg-tools (>= 0.10), + libxml-parser-perl, + xulrunner-1.9-dev (>= 1.9~b3~), + iso-codes (>= 0.35), + python-dev (>= 2.3), + python-gtk2-dev (>= 2.7.1), + python-gnome2-dev (>= 2.6.0), + gnome-doc-utils (>= 0.3.2), + intltool (>= 0.35.0), + x11proto-core-dev, + network-manager-dev, + quilt, + libenchant-dev (>= 1.0), + gtk-doc-tools (>= 1.0), + liblaunchpad-integration-dev, + libavahi-gobject-dev +Standards-Version: 3.7.2 + +Package: epiphany-browser +Architecture: all +Depends: epiphany-gecko | epiphany-webkit +Description: Intuitive web browser - dummy package + Epiphany is a simple yet powerful GNOME web browser targeted at + non-technical users. Its principles are simplicity and standards + compliance. + . + This dummy package installs Epiphany with the Gecko backend by default. + +Package: epiphany-gecko +Architecture: any +Depends: epiphany-browser-data (>= ${gnome:Version}), + epiphany-browser-data (<< ${gnome:NextVersion}), + ${shlibs:Depends}, + gnome-icon-theme (>= 2.9.90), + dbus, + iso-codes, + xulrunner-1.9 (>= 1.9~b3~), + ${misc:Depends} +Conflicts: epiphany-browser (<< 2.20.1-2ubuntu1) +Recommends: yelp, epiphany-extensions +Breaks: epiphany-extensions (<< 2.20.1-2ubuntu3) +Suggests: mozplugger +Provides: www-browser, gnome-www-browser +Description: Intuitive GNOME web browser - Gecko version + Epiphany is a simple yet powerful GNOME web browser targeted at + non-technical users. Its principles are simplicity and standards + compliance. Simplicity is achieved by a well designed user interface and + reliance on external applications for performing external tasks (such as + reading email). Simplicity should not mean less powerful. Standards + compliance is achieved on the HTML side by using the Gecko + rendering engine, as developed for the Mozilla and Firefox browsers; and + on the user interface side by closely following the GNOME Human Interface + Guidelines (HIG) and by close integration with the GNOME desktop. + . + This version uses the Gecko backend to render web pages. + . + Homepage: http://www.gnome.org/projects/epiphany/ + +Package: epiphany-browser-data +Architecture: all +Depends: ${misc:Depends} +Recommends: epiphany-browser +Conflicts: epiphany-browser (<< 2.20.1-2ubuntu1) +Replaces: epiphany-browser (<< 2.20.1-2ubuntu1) +Description: Data files for the GNOME web browser + Epiphany is a simple yet powerful GNOME web browser targeted at + non-technical users. Its principles are simplicity and standards + compliance. + . + This package contains the common files, artwork and translations for + Epiphany. + +Package: epiphany-browser-dev +Architecture: all +Section: devel +Depends: epiphany-gecko (>= ${binary:Version}), libgnomeui-dev (>= 2.16.0-2) +Description: Development files for the GNOME web browser + Epiphany is a simple yet powerful GNOME web browser targeted at + non-technical users. Its principles are simplicity and standards + compliance. + . + This package is required to develop extensions for Epiphany. + +Package: epiphany-browser-dbg +Architecture: any +Section: gnome +Priority: extra +Depends: epiphany-gecko (= ${binary:Version}) | epiphany-webkit (= ${binary:Version}) +Description: Debugging symbols for the GNOME web browser + Epiphany is a simple yet powerful GNOME web browser targeted at + non-technical users. Its principles are simplicity and standards + compliance. + . + This package contains detached debugging symbols. --- epiphany-browser-2.21.90.orig/debian/epiphany-webkit.menu +++ epiphany-browser-2.21.90/debian/epiphany-webkit.menu @@ -0,0 +1,6 @@ +?package(epiphany-webkit):needs="x11" \ + section="Applications/Network/Web Browsing" \ + title="Epiphany web browser (Webkit)" \ + longtitle="Epiphany web browser with Webkit backend" \ + command="/usr/bin/epiphany-webkit" \ + hints="Web browsers" --- epiphany-browser-2.21.90.orig/debian/rules +++ epiphany-browser-2.21.90/debian/rules @@ -0,0 +1,176 @@ +#!/usr/bin/make -f + +include /usr/share/gnome-pkg-tools/1/rules/uploaders.mk +DEB_VERSION := $(shell dpkg-parsechangelog | sed -n -e 's/^Version: //p') +include /usr/share/gnome-pkg-tools/1/rules/gnome-version.mk +-include /usr/share/gnome-pkg-tools/1/rules/gnome-get-source.mk + +GNOME_MODULE := epiphany + +STAMP_DIR := debian/stamp +BUILD_DIR := debian/build +PATCH_DIR := debian/patches + +DEB_HOST_ARCH_OS ?= $(shell dpkg-architecture -qDEB_HOST_ARCH_OS) +DEB_HOST_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE) +DEB_BUILD_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE) +DEB_BUILD_GNU_CPU ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_CPU) + +CFLAGS += -Wall -g -O$(if $(findstring noopt,$(DEB_BUILD_OPTIONS)),0,2) + +FLAVORS := gecko + +common_configure_flags := \ + --prefix=/usr \ + --mandir=\$${prefix}/share/man \ + --sysconfdir=/etc \ + --localstatedir=/var \ + --enable-dbus \ + --disable-scrollkeeper \ + --enable-zeroconf \ + --enable-python \ + --enable-network-manager + +ifeq ($(DEB_BUILD_GNU_TYPE),$(DEB_HOST_GNU_TYPE)) + common_configure_flags += --build=$(DEB_BUILD_GNU_TYPE) +else + common_configure_flags += --build=$(DEB_BUILD_GNU_TYPE) --host=$(DEB_HOST_GNU_TYPE) +endif + +gecko_configure_flags := $(common_configure_flags) \ + --libexecdir=\$${prefix}/lib/epiphany-gecko \ + --with-engine=mozilla \ + --with-gecko=libxul-embedding \ + --enable-gtk-doc \ + --enable-spell-checker + +webkit_configure_flags := $(common_configure_flags) \ + --libexecdir=\$${prefix}/lib/epiphany-webkit \ + --with-engine=webkit + +patch: $(STAMP_DIR)/patch-stamp +$(STAMP_DIR)/patch-stamp: + dh_testdir + mkdir -p $(STAMP_DIR) + QUILT_PATCHES=$(PATCH_DIR) quilt --quiltrc /dev/null push -a || test $$? = 2 + touch $@ + +builddir = $(BUILD_DIR)/$* + +configure: $(addprefix $(STAMP_DIR)/configure-stamp-, $(FLAVORS)) +$(STAMP_DIR)/configure-stamp-%: $(STAMP_DIR)/patch-stamp + dh_testdir + mkdir -p $(builddir) + cd $(builddir) && \ + CFLAGS="$(CFLAGS)" LDFLAGS="$(LDFLAGS)" \ + $(CURDIR)/configure $($*_configure_flags) + touch $@ + +build: $(addprefix $(STAMP_DIR)/build-stamp-, $(FLAVORS)) +$(STAMP_DIR)/build-stamp-%: $(STAMP_DIR)/configure-stamp-% + dh_testdir + $(MAKE) -C $(builddir) + touch $@ + +installdir = $(CURDIR)/debian/epiphany-$* + +install-clean: + dh_testdir + dh_testroot + dh_clean -k + +install-%: $(STAMP_DIR)/build-stamp-% + $(MAKE) -C $(builddir) install DESTDIR=$(installdir) + cd $(installdir)/usr/bin && mv epiphany epiphany-$* + rm -f $(installdir)/usr/lib/epiphany*/*/*/*a + echo gnome:Version=$(DEB_GNOME_VERSION) >> debian/epiphany-$*.substvars + echo gnome:NextVersion=$(DEB_GNOME_NEXTVERSION) >> debian/epiphany-$*.substvars + +install: install-clean $(addprefix install-, $(FLAVORS)) + dh_installdirs + mv debian/epiphany-gecko/usr/include debian/epiphany-browser-dev/usr/ + mv debian/epiphany-gecko/usr/lib/pkgconfig debian/epiphany-browser-dev/usr/lib/ + cd debian/epiphany-gecko/usr/share && \ + mv aclocal pygtk gtk-doc $(CURDIR)/debian/epiphany-browser-dev/usr/share/ + mv debian/epiphany-gecko/etc/* debian/epiphany-browser-data/etc + rmdir debian/epiphany-gecko/etc + mv debian/epiphany-gecko/usr/share debian/epiphany-browser-data/usr/ +# cd debian/epiphany-webkit && rm -rf etc usr/share usr/lib/pkgconfig usr/include + cd debian/epiphany-browser-data/usr/share/epiphany-browser && \ + mv mime-types-permissions.xml default-prefs.js $(CURDIR)/debian/epiphany-browser-data/etc/gnome/epiphany/ + cd debian/epiphany-browser-data/usr/share/man/man1 && \ + mv epiphany.1 epiphany-browser.1 +# Correct help file paths + cd debian/epiphany-browser-data/usr/share/omf && mv epiphany epiphany-browser + cd debian/epiphany-browser-data/usr/share/gnome/help && mv epiphany epiphany-browser + find debian/epiphany-browser-data/usr/share/omf/epiphany-browser/ \ + -name "*.omf" -exec perl -pi -e 's#/usr/share/gnome/help/epiphany/#/usr/share/gnome/help/epiphany-browser/#' {} \; + +# Make both epiphanies installable together + for f in $(FLAVORS); do \ + F=`echo $$f | sed -r 's/^([a-z])/\U\1/'` ; \ + mkdir -p debian/epiphany-$$f/usr/share/applications ; \ + ( sed -r "s/^Name(.*)$$/Name\1 ($$F)/" \ + debian/epiphany-browser-data/usr/share/applications/epiphany.desktop \ + | sed "s,epiphany-browser,epiphany-$$f," \ + | grep -v ^TryExec | grep -v ^MimeType ; \ + echo NoDisplay=true ) \ + > debian/epiphany-$$f/usr/share/applications/epiphany-$$f.desktop ; \ + done + dh_install + cd debian/epiphany-browser/usr/bin && \ + mv epiphany.sh epiphany + +clean:: + dh_testdir + dh_testroot + QUILT_PATCHES=$(PATCH_DIR) quilt --quiltrc /dev/null pop -a -R || test $$? = 2 + rm -rf .pc + rm -f po/.intltool-merge-cache + rm -f intltool-extract intltool-update intltool-merge + rm -rf $(INSTALL_DIR) $(BUILD_DIR) $(STAMP_DIR) + dh_clean + +binary: binary-arch binary-indep + +binary-indep: build install + dh_testdir + dh_testroot + dh_installchangelogs -i ChangeLog ChangeLog-* + dh_installdocs -i + dh_installman -i + dh_installmenu -i + dh_link -i + dh_scrollkeeper -i + dh_gconf -i + dh_desktop -i + dh_icons -i + dh_compress -i + dh_fixperms -i + dh_installdeb -i + dh_gencontrol -i + dh_md5sums -i + dh_builddeb -i + +binary-arch: build install + dh_testdir + dh_testroot + dh_installchangelogs -a ChangeLog ChangeLog-* + dh_installdocs -a + dh_installman -a + dh_installmenu -a + dh_link -a + dh_scrollkeeper -a + dh_gconf -a + dh_desktop -a + dh_icons -a + dh_strip -a --dbg-package=epiphany-browser-dbg + dh_compress -a + dh_fixperms -a + dh_installdeb -a + dh_shlibdeps -a + dh_gencontrol -a + dh_md5sums -a + dh_builddeb -a + +.PHONY: patch configure build install clean install-clean binary-indep binary-arch binary --- epiphany-browser-2.21.90.orig/debian/epiphany-browser-dev.dirs +++ epiphany-browser-2.21.90/debian/epiphany-browser-dev.dirs @@ -0,0 +1,2 @@ +/usr/lib +/usr/share --- epiphany-browser-2.21.90.orig/debian/epiphany-browser.install +++ epiphany-browser-2.21.90/debian/epiphany-browser.install @@ -0,0 +1,2 @@ +debian/epiphany.sh /usr/bin/ +debian/bug/control /usr/share/bug/epiphany-browser/ --- epiphany-browser-2.21.90.orig/debian/changelog +++ epiphany-browser-2.21.90/debian/changelog @@ -0,0 +1,1415 @@ +epiphany-browser (2.21.90-0ubuntu3) hardy; urgency=low + + * debian/patches/98_ephy-boot-xul-early.patch: + - change from Alexander Sack, load xulrunner earlier + + -- Sebastien Bacher Mon, 11 Feb 2008 14:07:32 +0100 + +epiphany-browser (2.21.90-0ubuntu2) hardy; urgency=low + + * debian/rules: + - use dh_icons so the icon is correctly available after installation + (LP: #188468) + + -- Sebastien Bacher Tue, 05 Feb 2008 15:19:04 +0100 + +epiphany-browser (2.21.90-0ubuntu1) hardy; urgency=low + + * 2.21.90 upstream tarball. + * add avahi-gobject-dev to Build-Depends + - update debian/control + * gnomevfs has been replaced by gio. drop gnomevfs dev package build dep + accordingly + - update debian/control + * disable patch fixed upstream (98b_gtk_nss_dialog_missing_symbol.patch) + - update debian/patches/series + + -- Alexander Sack Tue, 29 Jan 2008 12:59:23 +0100 + +epiphany-browser (2.21.4-0ubuntu5) hardy; urgency=low + + * Revert the 12_gxx43 patch before upload. + + -- Matthias Klose Fri, 25 Jan 2008 13:10:58 +0000 + +epiphany-browser (2.21.4-0ubuntu4) hardy; urgency=low + + * Fix build failures with g++-4.3. + + -- Matthias Klose Thu, 24 Jan 2008 15:03:42 +0000 + +epiphany-browser (2.21.4-0ubuntu3) hardy; urgency=low + + * respin against updated xulrunner-1.9 (>= 1.9~b3~) that uses system-nspr + nss,cairo: + - update debian/control + * fix http authentication by implementing nsIPromptService2 as a workaround + until xulrunner implements a proper adaptor to nsIPromptService + - add debian/patches/98a_nsipromptservice2_workaround.patch + - update debian/patches/series + * implement missing symbol |DisplayProtectedAuth| recently added to xulrunner + trunk + - add debian/patches/98b_gtk_nss_dialog_missing_symbol.patch + - update debian/patches/series + + -- Alexander Sack Wed, 02 Jan 2008 12:54:28 +0100 + +epiphany-browser (2.21.4-0ubuntu2) hardy; urgency=low + + * debian/control.in, debian/rules: + - build using xulrunner + * debian/patches/98_xulrunner1.9_build_changes.patch: + - changes from Alexander Sack to build using xulrunner1.9 + * debian/patches/99_autoreconf.patch: + - updated + + -- Sebastien Bacher Tue, 18 Dec 2007 15:22:07 +0100 + +epiphany-browser (2.21.4-0ubuntu1) hardy; urgency=low + + * New upstream version + A big refactoring of the Epiphany internals was done in order to achieve + better cross-engine support. It can be roughly separated in two chunks: + - EphyTab and its usage of GtkMozEmbed specific signals was transformed + into generic code under EphyBaseEmbed with backend-agnostic + gobject-properties. Backends are now encouraged to subclass EphyBaseEmbed + and update its properties to keep them in sync with the engine state. + In turn, the browser chrome will connect to the notify:: signals + for the properties to update its UI to reflect those changes. + - In some situations the embed/ code will need to know some specific + details of the fronted (for example, the active child among all the + embed instances in the popup management code). Instead of directly + accessing the fronted, an generic EphyEmbedContainer interface + has been created, offering all the needed methods.In Epiphany, + this interface is implemented by EphyWindow. + Bug fixes: + - Add saved files to the GtkRecent list. Fixes Bug #148401. + - Make cursor be at the end of the URL when selecting entries from the + completion popup. Fixes bug #466344. + - Fix multihead problems in toolbar editor. + - Fix download-icon toolip updates. Fixes bug #343238. + - Default to Cancel on Cert dialogues. Fixes bug #163379. + - Remove "Add bookmark" and "Save as" from the document context menu. + Part of bug #332968. + - Fix completion model to show icons for history items too, + history/bookmarks/favicon_cache service objects are now stored in the + completion priv. Fixes bug #459811. + - Sets page header and footer margins to a reasonable value when printing. + Workaround for bug #346110. + - Adds a check for NULL pointer in ephy-session.c, fixing wrong behaviour + when restoring Epiphany in some cases. Fix for bug #488718. + - Updates to new NetworkManager API signals for status monitoring. + - Take the page orientation from the page setup, not from + the print settings. Bug #485670 (see also gtk+ bug #485685). + - Makes the Go button behaviour consistent with the "Enter" behaviour. Both + actions search for keywords or load the url. Fixes #484178. + - EphyContentPolicy::ShouldLoad: use the same content policy for + http and https, allowing adblock to work on https. Fixes bug #471583. + - Make Epiphany properly remember the last saved location + in the FileChooser. Fix for bug #336251. + - Make session recovery focus work properly and remember the active tab. + Fixes bug #317272. + - Fix disable_toolbar_editing lockdown not respected for Remove and Move + actions on toolbar buttons. Fixes bug #475641. + - Change the hint of the bookmarking properties dialog to DIALOG, instead + of NORMAL. Make bookmarking work in fullscreen mode and does not put + bookmark properties windows in the taskbar. Fixes bug #478928. + - Find toolbar now remembers last pattern searched also when opened with + slash or apostrophe. Fixes bug #343337. + - Add a somewhat tricky fix for url titles not visible on the completion + popup of the location entry when using a dark theme (like Darkilouche). + Fixes bug #446898. + - Private instances of Epiphany now remove the profile dir on exit. + Note that the profile dir won't be deleted if it's a custom path. + Fixes bug #329680. + - Make "Up" button dropdown menu show titles instead of URLs for already + visited pages. Fix for bug #323764. + - Remove ellipsis from View -> Page Security Information, as it does not + require further user interaction to complete. Fix for bug #483312. + - Hide Back/Forward buttons when disable_history lockdown key is enabled. + Fixes bug #394795. + - Add explanation label to "Only from sites you visit" radio button. + Fixes bug 493422. + Changes: + - Add accessibility theme icons for our apps icon. + - Enable printing to PDF file on gecko 1.9, now that moz#367907 is fixed. + - Make 'Not found' on find toolbar temporarily bold and sounds the bell + signal when searching on a page and no results are found. + Fixes bug #363004. + - Makes tooltips for Back and Forward buttons display the titles of + relative pages. Fixes bug #341400. + - Add drag-and-drop of URLs onto "New Tab" and "New Window" buttons in + the toolbar. Fixes bug #382383. + - Add a broom icon in the search entry of the History window, + like in Bookmarks Editor. Fixes bug #476179. + - Use friendly display for mailto: links; shows a nice text in status bar + when hovering a mailto: link. Fixes bug #339161. + - Fix the build of the custom GTK+ filepicker. Add a preview for the + FileChooser. The default size is 150x150. Fixes bug #440859. + - Make the location entry completion cells smarter, now bookmarks take the + full width of the popup. Also make titles of history entries align + to the left so it's easier to browse a lot of entries with similar + titles. Almost-fixes bug #419475. + - Change the "Powered by" name in the About dialog according to the used + backend. Fix for bug #478196. + - Display "Execute script " string as tooltip for bookmark action + instead of the whole javascript code when bookmarking a scriptlet. + Fix bug #492695. + - Update to latest EggToolbarEditor code. + This supports changing the editor's model during runtime and + tries to avoid some possibly leaking signal handlers. Fixes bug #493149. + - Adds a column in the history window showing the date and the time of the + visit, substitutes radiobuttons with checkboxes in the View menu of the + window. Fix bug #380156. + - Enable a --with-distributor-name configure option, defaulting to Epiphany. + Use it on an error page to designate the distributors/developers to + contact. Fixes bug #433796. + - Add a "Remove all" button to the Personal Data Manager for both the + cookies and the passwords. Addresses bug #148314. + - Fix a bug in EphyNodeView which caused problems when setting columns + as resizable; thanks to Kristian Rietveld for finding out the cause. + Make history window columns resizable and bookmarks editor columns + resizable and sortable. Fixes bug #132808. + * debian/control.in: + - use Breaks on epiphany-extensions due to version change + * debian/patches/02_ac_init.patch: + - updated + * debian/patches/08_localized_startup_page.patch: + - updated + * debian/patches/13_powered-by.patch, + debian/patches/14_webkit-scrollbars.patch, + debian/patches/15_webkit-gtk-api.patch, + debian/patches/16_webkit-missing-methods.patch, + debian/patches/17_webkit-signal-emission.patch: + - removed, fixed with the new version + * debian/patches/99_autoreconf.patch: + - updated + + -- Sebastien Bacher <seb128@canonical.com> Mon, 17 Dec 2007 10:32:26 +0100 + +epiphany-browser (2.20.2-1ubuntu2) hardy; urgency=low + + * debian/control.in: + - epiphany-browser-dbg recommends firefox-dbg (LP: #174445) + * debian/patches/07_use_correct_program_name.patch: + - dropped, not required since there is an epiphany-browser alternative now, + and fixes the help directory (LP: #175157) + * debian/rules: + - use the same gecko directory naming than debian + + -- Sebastien Bacher <seb128@canonical.com> Tue, 11 Dec 2007 12:55:51 +0100 + +epiphany-browser (2.20.2-1ubuntu1) hardy; urgency=low + + * The webkit variant is not built for now since it's not juged good enough + to compete with the gecko one yet and not worth promoting webkit. + The package could be maintained to universe as a different source for now. + * Sync with Debian + * debian/control.in: + - Build-Depends on firefox-dev (>= 1.5), liblaunchpad-integration-dev + - Depends on firefox (>= 1.5) and not xulrunner-gnome-support + - don't build the webkit variant + - don't Build-Depends on libxul-dev + - don't Recommends xulrunner debug packages + - mention Firefox rather than Iceweasel + - package maintained by the Ubuntu Desktop Team + - update transition version + * debian/epiphany-browser-data.gconf-defaults: + - change startup page + * debian/patches/03_dbus.patch: + - don't use hack from Debian to start a private instance when it can't + connect to the dbus, changes made while running that mode are not stored + (Ubuntu: #74725) + * debian/patches/06_lpi.patch: + - launchpad integration + * debian/patches/07_use_correct_program_name.patch: + - use "epiphany" instead of PACKAGE to work with the epiphany-browser name + change, fix session storing (Ubuntu: #43130) + * debian/patches/08_localized_startup_page.patch: + - use the startup page corresponding to the locale used + * debian/patches/11_useragent-weasel.patch: + - don't use, the change is Debian specific + * debian/patches/99_autoreconf.patch: + - updated + * debian/rules: + - build with firefox, not xulrunner + - don't build the webkit variant + - don't change the gecko build directory + + -- Sebastien Bacher <seb128@canonical.com> Wed, 05 Dec 2007 14:17:00 +0100 + +epiphany-browser (2.20.2-1) unstable; urgency=low + + [ Josselin Mouette ] + * debian/bug/control: ship a bug control file in epiphany-browser to + correctly report dependencies of epiphany-{gecko,webkit}. + + [ Sebastian Dröge ] + * New upstream bugfix release: + + debian/patches/18_ephy-session_crash.patch: + - Dropped, merged upstream. + + debian/patches/02_ac_init.patch: + - Updated for the new version. + + debian/patches/99_autoreconf.patch: + - Regenerated. + + -- Sebastian Dröge <slomo@debian.org> Sat, 01 Dec 2007 17:45:45 +0100 + +epiphany-browser (2.20.1-2) unstable; urgency=low + + * 18_ephy-session_crash.patch: stolen from upstream SVN. Fixes crash + when loading a session. Closes: #449003. + + -- Josselin Mouette <joss@debian.org> Thu, 15 Nov 2007 21:14:29 +0100 + +epiphany-browser (2.20.1-1) unstable; urgency=low + + [ Nelson A. de Oliveira ] + * Fix menu files for epiphany-webkit and epiphany-gecko (Closes: #444066). + + [ Josselin Mouette ] + * 13_powered-by.patch: stolen from SVN. Don't display "powered by + Gecko" in the webkit version's about dialog. Also fix translations + accordingly. Closes: #444999. + * 14_webkit-scrollbars.patch: stolen from SVN. Implement size_request + for EphyTab, getting scrollbars to work for the webkit engine. + Closes: #444044. + + [ Sebastian Dröge ] + * New upstream bugfix release: + + debian/patches/02_ac_init.patch: + - Updated for the new version. + + debian/patches/12_contentmanager_block_https.patch: + - Dropped, merged upstream. + * debian/patches/15_webkit-gtk-api.patch: + + Update to the latest WebKit/Gtk API. Patch taken from upstream SVN. + Closes: #447371. + * debian/patches/16_webkit-missing-methods.patch: + + Implement some missing methods and add some workarounds for WebKit + bugs. Patch taken from upstream SVN. There are more patches in SVN + that make the WebKit backened more useful but can't easily be backported + because of API changes in epiphany. + * debian/patches/17_webkit-signal-emission.patch: + + Don't emit signal that we don't have. Patch taken from upstream SVN. + * debian/patches/99_autoreconf.patch: + + Regenerate autotools stuff for the new version. + + -- Sebastian Dröge <slomo@debian.org> Thu, 01 Nov 2007 06:37:43 +0100 + +epiphany-browser (2.20.0-2) unstable; urgency=low + + [ Josselin Mouette ] + * Fix typo that lead NoDisplay to be ignored. + * Remove MimeType entries from the additional .desktop files. + * 12_contentmanager_block_https.patch: use the same content policy for + http and https, allowing adblock to work on https. Closes: #439772. + + [ Loic Minier ] + * Cleanup whitespaces in control. + + -- Josselin Mouette <joss@debian.org> Sat, 29 Sep 2007 01:28:11 +0200 + +epiphany-browser (2.20.0-1) unstable; urgency=low + + * epiphany.sh: ship epiphany as a wrapper script for epiphany-browser + instead of a symbolic link the other way round. This way all + processes should be named epiphany-browser which is recognized by + bug-buddy. Closes: #433443. + * New upstream release. + * Bump required build-dependencies. + * Build two flavors of epiphany, one with webkit and one with gecko. + * Separate them in two packages installable simultaneously. + * 00_browser_wrapper_path.patch: add a TryExec key as the desktop + entry is moved to the data package. + * Refresh other patches. + * 05_libexecdir.patch: use libexecdir for the plugin directory, so + that it can be different for both backends. + * Introduce a new alternative, epiphany-browser, and register both + versions for it. + * epiphany-browser.menu: update to the new menu policy. + * Enable build of documentation; build-depend on gtk-doc-tools. + + -- Josselin Mouette <joss@debian.org> Fri, 21 Sep 2007 17:10:27 +0200 + +epiphany-browser (2.18.3-1) unstable; urgency=low + + * Fix copyright (closes: #428099). + * New upstream bugfix release. + + Refresh patches. + * 11_useragent-weasel.patch: comment out the UA breakage that upstream + introduces for xulrunner users and explain why we do it. + + -- Josselin Mouette <joss@debian.org> Wed, 04 Jul 2007 22:23:31 +0200 + +epiphany-browser (2.18.2-1) unstable; urgency=low + + [ Sam Morris ] + * Drop 11_spell-checker-for-1.8.0.patch now that xulrunner 1.8.1 is + available. Also bump build-depends appropriately. Closes: #414558. + + [ Josselin Mouette ] + * Fix watch file. + * Split translations and data files in a separate + epiphany-browser-data package. + + Include gnome-version.mk for ${gnome:Version}. + * Ship debugging symbols in epiphany-browser-dbg (closes: #425290). + + debian/compat: use debhelper mode 5. + + Build-depend on debhelper 5. + * Wrap depends and build-depends. + * Improve descriptions a bit. + * Use ${binary:Version}. + * Replace some file moves in debian/rules by correct .install files. + * README: removed, obsolete. + * New upstream translation and bugfix release. + * 02_ac_init.patch: updated. + * 04_move_tabs.patch: disabled for the moment, it doesn't work. + * 08_load_on_new_tab.patch: ditto. + * 99_configure.patch: refreshed. + + -- Josselin Mouette <joss@debian.org> Sat, 02 Jun 2007 11:56:53 +0200 + +epiphany-browser (2.18.1-3) unstable; urgency=low + + * 09_download_dialog.patch: still kill the download dialog, but + reinstate the distinction between download and save for security + reasons (closes: #424765). Also improve the preferences dialog to + make insensitive the download folder selection when necessary. + + -- Josselin Mouette <joss@debian.org> Sat, 19 May 2007 00:03:32 +0200 + +epiphany-browser (2.18.1-2) unstable; urgency=low + + [ Josselin Mouette ] + * epiphany-browser.gconf-defaults: set the default language to + "system" so that epiphany uses content negociation by default. + Thanks Roland Mas for noticing. + + [ Sebastian Dröge ] + * Upload to unstable, drop check-dist include. + * Disable 11_spell-checker-for-1.8.0 and update 99_configure. spellchecking + support is disabled again in xulrunner for now. + + -- Sebastian Dröge <slomo@debian.org> Wed, 25 Apr 2007 01:08:24 +0200 + +epiphany-browser (2.18.1-1) experimental; urgency=low + + * Fix changelog and version the libenchant-dev build-dep. + * New upstream release + - Rename patch 100_spell-checker-for-1.8.0 to 11_spell-checker-for-1.8.0 + and only patch configure.ac; refresh. + - Update patch 99_configure. + - Update patch 02_ac_init. + + -- Loic Minier <lool@dooz.org> Mon, 09 Apr 2007 16:05:07 +0200 + +epiphany-browser (2.18.0-3) experimental; urgency=low + + [ Loic Minier ] + * Add a pre-build:: target to workaround a missing nspr.pc in libxul-dev + 1.8.0.11-3: symlink xulrunner-nspr.pc as nspr.pc in debian/pkg-config and + list debian/pkg-config in PKG_CONFIG_PATH; thanks Sam Morris and + Mike Hommey. + + [ Josselin Mouette ] + * 10_url_double-click.patch: patch from Sam Hocevar to make the + behavior when double-clicking in the URL bar conform to the rest of + the desktop (closes: #417836). + + [ Loic Minier ] + * Spell checking support: + - Build-dep against libxul-dev 1.8.0.11-3 and libenchant-dev. + - Pass --enable-spell-checker to configure. + - New patch, 100_spell-checker-for-1.8.0, allows using the spell checker + with Xulrunner <= 1.8.1. + + -- Loic Minier <lool@dooz.org> Mon, 09 Apr 2007 12:01:07 +0200 + +epiphany-browser (2.18.0-2) experimental; urgency=low + + [ Josselin Mouette ] + * Re-introduce 00_browser_wrapper_path.patch to avoid any issue with + the epiphany game package. + + Call epiphany-browser explicitly instead of hardcoding the path. + * Bump back conflict on epiphany-extensions to << 2.16, as the 2.16 + series have correct dependencies. + + [ Loic Minier ] + * Merge 2.14.3-2 up to 2.14.3-6; SVN r7118:9090. + * Drop patch 06_dbus_connection_close, merged upstream. + * Drop patch 30_bookmark-editor-crash, merged upstream. + + -- Loic Minier <lool@dooz.org> Sun, 18 Mar 2007 19:01:57 +0100 + +epiphany-browser (2.18.0-1) experimental; urgency=low + + [ Sam Morris ] + * New upstream release. + * Refresh patches. + * Bump conflict on epiphany-extensions to << 2.18 + * Drop 00_browser_wrapper_path.patch; seems useless + + [ Loic Minier ] + * Drop patch 05_xulrunner; merged upstream. + * Include CDBS's utils. + + -- Loic Minier <lool@dooz.org> Mon, 12 Mar 2007 14:21:50 +0100 + +epiphany-browser (2.16.3-1) experimental; urgency=low + + * New upstream release. + * Refresh patches. + + -- Josselin Mouette <joss@debian.org> Thu, 1 Mar 2007 22:12:53 +0100 + +epiphany-browser (2.16.2-4) experimental; urgency=low + + * Bump the epiphany-browser-dev dep on libgnomeui-dev to 2.16.0-2 as well. + + -- Loic Minier <lool@dooz.org> Sun, 4 Feb 2007 12:30:05 +0100 + +epiphany-browser (2.16.2-3) experimental; urgency=low + + [ Loic Minier ] + * Set GNOME_MODULE to epiphany for get-orig-source. + + [ Josselin Mouette ] + * 09_download_dialog.patch: remove the annoying dialog that lets the + user choose between "download" and "save as". Also remove the + distinction between the gconf keys. Closes: #280280. + + [ Loic Minier ] + * Include the new check-dist Makefile to prevent accidental uploads to + unstable; bump build-dep on gnome-pkg-tools to >= 0.10. + * Bump up libgnomeui-dev build-dep to >= 2.16.0-2 as Gtk 2.10 requires it + anyway. + + -- Loic Minier <lool@dooz.org> Mon, 22 Jan 2007 11:09:05 +0100 + +epiphany-browser (2.16.2-2) experimental; urgency=low + + [ Loic Minier ] + * Add a get-orig-source target to retrieve the upstream tarball. + + [ Josselin Mouette ] + * Depend on xulrunner-gnome-support (closes: #404755). + * 06_ssl_weak_ciphers.patch: enable SSL weak ciphers, as epiphany + warns about their use anyway, thanks Mike Hommey (closes: #368259). + * epiphany-browser.dirs: create /etc/gnome/epiphany. + * rules: move default-prefs.js mime-types-permissions.xml to this + directory to make them conffiles (closes: #195406). + * 07_bookmarks.patch: provide some Debian-related bookmarks by default + (closes: #175014). + * epiphany-browser.gconf-defaults: set the homepage to the Debian + website. + * epiphany-browser.links: add a /usr/bin/epiphany-browser link to make + session saving work, thanks Håvard Moen (closes: #375003). + + Also add a link for the manual page. + * 08_load_on_new_tab.patch: patch from Cyril Brulebois to add a gconf + key allowing to emulate the mozilla behavior when loading new tabs + (closes: #402177). + + -- Josselin Mouette <joss@debian.org> Fri, 12 Jan 2007 12:59:27 +0100 + +epiphany-browser (2.16.2-1) experimental; urgency=low + + [ Loic Minier ] + * Update description to use Iceweasel instead of Firefox. + + [ Josselin Mouette ] + * New upstream release. + * Refresh patches. + + -- Josselin Mouette <joss@debian.org> Sun, 26 Nov 2006 22:16:38 +0100 + +epiphany-browser (2.16.1-1) experimental; urgency=low + + * New upstream release. + * rules: switch to quilt for patch handling. + * Build-depend on quilt. + * Update patches for the new version. + + -- Josselin Mouette <joss@debian.org> Sun, 19 Nov 2006 18:08:37 +0100 + +epiphany-browser (2.16.0-1) experimental; urgency=low + + * New upstream release. + * 04_move_tabs.patch: re-enable the ability to move tabs between + windows now the bug is fixed in xulrunner (closes: #317724). + * 00_browser_wrapper_path.patch: cleanup. + * Please Jordi by taking over maintainership of the package. + * 01_bookmarks_menu.patch: updated. + * 02_ac_init.patch: updated. + * 99_configure.patch: updated accordingly. + * NEWS: removed, its content is no more relevant. + * Update watch file for 2.16. + * Build-depend on intltool 0.35.0 and x11proto-core-dev. + * Remove useless build-dependencies on liborbit, perl and gnome-print. + * Bump requirements on glib, gtk, iso-codes, libgnome and libgnomeui. + * Enable network manager by passing --enable-network-manager. + + Build-depend on network-manager-dev. + * epiphany-browser-dev.install: add /usr/share/pygtk and + /use/share/aclocal. + * epiphany-browser.install: add /usr/share/dbus-1 and replace + /usr/share/pixmaps by /usr/share/icons. + * Conflict with epiphany-extensions << 2.16. + + -- Josselin Mouette <joss@debian.org> Sat, 9 Sep 2006 21:49:22 +0200 + +epiphany-browser (2.14.3-6) unstable; urgency=medium + + * Add a get-orig-source target to retrieve the upstream tarball. + * New patch, 30_bookmark-editor-crash, workaround for a crash in the + bookmark-editor; GNOME #351814. + + -- Loic Minier <lool@dooz.org> Mon, 26 Feb 2007 11:24:28 +0100 + +epiphany-browser (2.14.3-5) unstable; urgency=medium + + * 07_bookmarks.patch: provide some Debian-related bookmarks by default + (closes: #175014). + * epiphany-browser.gconf-defaults: set the homepage to the Debian + website. + * epiphany-browser.links: add a /usr/bin/epiphany-browser link to make + session saving work, thanks Håvard Moen (closes: #375003). + * Urgency is medium to get the session fix and the branding changes to + etch. + + -- Josselin Mouette <joss@debian.org> Fri, 12 Jan 2007 13:25:07 +0100 + +epiphany-browser (2.14.3-4) unstable; urgency=medium + + * debian/control.in: depend on xulrunner-gnome-support (closes: #404755). + + -- Jordi Mallach <jordi@debian.org> Thu, 28 Dec 2006 23:54:04 +0100 + +epiphany-browser (2.14.3-3) unstable; urgency=low + + [ Loic Minier ] + * Provide gnome-www-browser. + * Suggest mozplugger instead of mozilla-bonobo; thanks Adam C Powell IV; + closes: #393981. + + [ Jordi Mallach ] + * 06_dbus_connection_close.patch: don't call dbus_connection_close(); + unref'ing it should be enough. Suggested by Sjoerd. + + -- Jordi Mallach <jordi@debian.org> Wed, 25 Oct 2006 11:22:28 +0200 + +epiphany-browser (2.14.3-2) unstable; urgency=low + + * 04_move_tabs.patch: re-enable the ability to move tabs between + windows now the bug is fixed in xulrunner (closes: #317724). + * Conflict with epiphany-extensions << 2.14. + + -- Josselin Mouette <joss@debian.org> Wed, 27 Sep 2006 15:38:53 +0200 + +epiphany-browser (2.14.3-1) unstable; urgency=low + + * New upstream release. + - Update the 02_ac_init and 99_configure patches. + + -- Loic Minier <lool@dooz.org> Mon, 7 Aug 2006 22:28:46 +0200 + +epiphany-browser (2.14.2.1-3) unstable; urgency=low + + * 03_dbus.patch: add a warning dialog when the dbus session isn't + found (closes: #373798). + + -- Josselin Mouette <joss@debian.org> Sun, 18 Jun 2006 12:54:32 +0200 + +epiphany-browser (2.14.2.1-2) unstable; urgency=low + + * Generate the configure patch with autoconf 2.59a-9 as newer versions + require another level of shell expansion to resolve datadir, and hence + cause the AM_GLIB_DEFINE_LOCALEDIR macro to fail miserably. + [debian/patches/99_configure.patch] + + -- Loic Minier <lool@dooz.org> Sun, 4 Jun 2006 16:22:30 +0200 + +epiphany-browser (2.14.2.1-1) unstable; urgency=low + + [ Josselin Mouette ] + * 03_dbus.patch: fall back on being a private instance when there is no + session bus (closes: #361072). + + [ Loic Minier ] + * New upstream release. + - Update patches. + [debian/patches/00_browser_wrapper_path.patch, + debian/patches/02_ac_init.patch, debian/patches/03_dbus.patch, + debian/patches/99_configure.patch] + * Make package binNMU-able by changing the ${Source-Version} dependency of + epiphany-browser-dev on epiphany from "=" to ">=". + [debian/control, debian/control.in] + + -- Loic Minier <lool@dooz.org> Thu, 1 Jun 2006 11:22:48 +0200 + +epiphany-browser (2.14.1-3) unstable; urgency=low + + * Brown paper bag release. + * Turn the build-dependency on dbus into a dependency. + + -- Guilherme de S. Pastore <gpastore@debian.org> Fri, 12 May 2006 20:46:05 -0300 + +epiphany-browser (2.14.1-2) unstable; urgency=low + + [ Guilherme de S. Pastore ] + * debian/control.in: + - added build-dependency on dbus (Closes: #360836). + - updated Standards-Version to 3.7.2. + + [ Jordi Mallach ] + * debian/control.in: epiphany-browser-dev depends on libgnomeui-dev. + + -- Guilherme de S. Pastore <gpastore@debian.org> Fri, 12 May 2006 19:16:30 -0300 + +epiphany-browser (2.14.1-1) unstable; urgency=low + + * New upstream release. + - debian/patches/{02_ac_init,99_configure}.patch: updated. + * Sourceful upload makes it installable again (Closes: #364267). + + -- Guilherme de S. Pastore <gpastore@debian.org> Sat, 22 Apr 2006 15:23:30 -0300 + +epiphany-browser (2.14.0-1) unstable; urgency=low + + * New upstream release. + - no more annoying HOWL compatibility warning (closes: #354761). + - fixes slowness of 1.8.x when using xulrunner (closes: #354822). + * debian/control.in: Updated build-deps as per configure.ac. + * debian/epiphany-browser.install: remove uneeded entries. + * debian/watch: updated for 2.14. + * debian/patches/00_browser_wrapper_path.patch: update filenames. + * debian/patches/01_bookmarks_menu.patch: update to Ubuntu's version. + * debian/patches/02_server_path.patch: removed, obsolete. + * debian/patches/03_ac_init.patch: updated. + * debian/patches/03_ac_init.patch: moved... + * debian/patches/02_ac_init.patch: here. Now contains configure.ac changes + only. + * debian/patches/04_debian_user_agent.patch: removed, xulrunner advertises + already. + * debian/patches/05_xulrunner.patch: updated. + * debian/patches/99_configure.patch: generated with `autoconf && rm -rf + autom4te.cache`. + + -- Jordi Mallach <jordi@debian.org> Wed, 29 Mar 2006 23:54:28 +0200 + +epiphany-browser (1.8.5-2) unstable; urgency=low + + * Remove dependency on xulrunner, it is unuseful now xulrunner is + fixed. + + -- Josselin Mouette <joss@debian.org> Tue, 21 Feb 2006 20:36:31 +0100 + +epiphany-browser (1.8.5-1) unstable; urgency=low + + * New upstream release. + * Apply patch from Mike Hommey to enable building against the new libxul + packages (closes: #351976). + - debian/control.in: + + Changed Build-deps from mozilla-browser to libxul-dev. + + Changed epiphany-browser's dependencies and conflicts accordingly. + - debian/rules: Add --with-mozilla=xulrunner to the configure line. + - debian/patches/05_xulrunner.patch: Correctly detect libmozjs location. + * The above removes epiphany's much hated dependency on mozilla-browser, + and closes: #271582). + * debian/rules: don't overwrite DEB_CONFIGURE_EXTRA_FLAGS. + * debian/control.in: + - conflict with epiphany-extensions (<< 1.8.2-5) to ensure we get + a xulrunner-enabled build. + - temporarily depend on xulrunner, to workaround a bug. + + -- Jordi Mallach <jordi@debian.org> Mon, 20 Feb 2006 20:39:59 +0100 + +epiphany-browser (1.8.3-4) unstable; urgency=low + + * debian/control.in: Build-Depend on python-dev. + * debian/rules: add --enable-python to configure flags (closes: #352236). + + -- Jordi Mallach <jordi@debian.org> Fri, 10 Feb 2006 20:32:28 +0100 + +epiphany-browser (1.8.3-3) unstable; urgency=low + + * Upload to unstable + + Loic Minier <lool@dooz.org>: + * Register and unregister a new gnome-www-browser alternative. + [debian/epiphany-browser.postinst, debian/epiphany-browser.prerm] + + Gustavo Noronha: + * debian/control.in: + - bumped Standards-Version to 3.6.2 with no changes + + -- Gustavo Noronha Silva <kov@debian.org> Sat, 7 Jan 2006 19:06:16 -0200 + +epiphany-browser (1.8.3-2) experimental; urgency=low + + * Build against dbus >= 0.60 + + -- Sjoerd Simons <sjoerd@debian.org> Sun, 18 Dec 2005 22:50:26 +0100 + +epiphany-browser (1.8.3-1) experimental; urgency=low + + [ Jordi Mallach ] + * New upstream release. + * 03_ac_init.patch: updated. + + [ Loic Minier ] + * Menu transition, part 1 and 2: move from #!/usr/sbin/install-menu to + #!/usr/bin/install-menu. [debian/epiphany-browser.install] + + [ Sjoerd Simons ] + * Enable zeroconf for bookmarks + + -- Jordi Mallach <jordi@debian.org> Thu, 1 Dec 2005 19:17:12 +0100 + +epiphany-browser (1.8.2-1) experimental; urgency=low + + * New upstream release. + * Don't build-depend on gcc-3.4 for amd64 anymore. + * 03_ac_init.patch: updated. + * Add watch file. + * Require orbit2 2.12.4 for ORBIT2_MAYBE_CONST. + * Cleanup dependencies. + * epiphany-browser.prerm: remove bashism. + + -- Josselin Mouette <joss@debian.org> Sun, 9 Oct 2005 20:09:58 +0200 + +epiphany-browser (1.8.0-1) experimental; urgency=low + + * New upstream release + * Don't build with gcc-3.4 for amd64 anymore + * Build with the experimental dbus packages + * debian/patches/04_debian_user_agent.patch + + Updated + * Sync with ubuntu + - Also rename omf files from epiphany to epiphany-browser + - debian/patches/02_server_path.patch + + Updated + - debian/patches/03_ac_init.patch + + Updated + + -- Sjoerd Simons <sjoerd@debian.org> Thu, 8 Sep 2005 11:29:47 +0200 + +epiphany-browser (1.6.5-1) experimental; urgency=low + + * New upstream version. + * Ondřej Surý: + - debian/paches/03_ac_init.patch: updated. + * Jordi Mallach: + - debian/control: build-depend on mozilla-dev (>= 1.7.10) for C++ + transition. + + -- Jordi Mallach <jordi@debian.org> Wed, 31 Aug 2005 17:26:26 +0200 + +epiphany-browser (1.6.4-1) unstable; urgency=low + + * New upstream release. + * debian/paches/03_ac_init.patch: updated. + + -- Jordi Mallach <jordi@debian.org> Tue, 5 Jul 2005 14:59:54 +0200 + +epiphany-browser (1.6.3-2) unstable; urgency=low + + * The "helix, use this cool Desktop and become a real GNOME Woman!" + release. + * Upload to unstable. + * debian/control.in: update Build-Depends (closes: #309195). + * The blurry icon for bookmarks editor is gone (closes: #287951). + * Ephy no longer shows the "Exit Fullscreen" button on all workspaces + (closes: #229622). + + -- Jordi Mallach <jordi@debian.org> Wed, 8 Jun 2005 01:03:16 +0200 + +epiphany-browser (1.6.3-1) experimental; urgency=low + + * New upstream release. + * debian/paches/03_ac_init.patch: updated. + + -- Jordi Mallach <jordi@debian.org> Wed, 27 Apr 2005 16:09:39 +0200 + +epiphany-browser (1.6.2-1) experimental; urgency=low + + * New upstream version. + * debian/patches/03_ac_init.patch: + - updated. + * debian/patches/05_toolbar_activation.patch: + - fixed with the new version. + + -- Sebastien Bacher <seb128@debian.org> Thu, 14 Apr 2005 15:40:31 +0200 + +epiphany-browser (1.6.1-1) experimental; urgency=low + + * New upstream release. + * debian/control.in: + - update build-depends and add dbus. + - depend on gnome-icon-theme and iso-codes. + * debian/rules: + - enable dbus support. + - build with gcc/g++ 3.4 for amd64 (closes: #287642). + * debian/patches/03_ac_init.patch: updated. + * debian/patches/01_bookmarks_menu.patch: stolen from Hoary; hide the + bookmarks manager menu item. + * debian/patches/04_debian_user_agent.patch: just identify as "Debian", + don't give the full source version. + * debian/05_toolbar_activation.patch: patch from CVS to fix toolbar + activation. + + -- Jordi Mallach <jordi@debian.org> Sat, 9 Apr 2005 12:33:49 +0200 + +epiphany-browser (1.4.8-2) unstable; urgency=low + + * debian/control.in: bump mozilla requirements to >= 1.7.6 to fix the + IDN domain spoofing security issue (CAN-2005-0238, closes: #294270). + + -- Jordi Mallach <jordi@debian.org> Thu, 24 Mar 2005 17:54:16 +0100 + +epiphany-browser (1.4.8-1) unstable; urgency=low + + * New upstream release. + + -- Jordi Mallach <jordi@debian.org> Sun, 27 Feb 2005 17:31:10 +0100 + +epiphany-browser (1.4.7-3) unstable; urgency=low + + * debian/patches/04_debian_user_agent.patch: add Debian package version to + the User-Agent string (thanks Loïc Minier; closes: #268655). + * debian/rules: add a define to CXXFLAGS with the Debian source version. + * debian/control.in: + - add a suggestion on mozilla-bonobo to epiphany-browser + (closes: #276492). + - recommend epiphany-extensions. + + -- Jordi Mallach <jordi@debian.org> Thu, 10 Feb 2005 23:24:41 +0100 + +epiphany-browser (1.4.7-2) unstable; urgency=medium + + * Rebuild against mozilla 1.7.5 to fix mouse buttons breakage. + * debian/control.in: build-depend and depend on + mozilla-browser (>= 2:1.7.5). + + -- Jordi Mallach <jordi@debian.org> Fri, 7 Jan 2005 17:05:05 +0100 + +epiphany-browser (1.4.7-1) unstable; urgency=low + + * New upstream release. + * debian/patches/03_ac_init.patch: update. + + -- Jordi Mallach <jordi@debian.org> Sun, 26 Dec 2004 01:15:41 +0100 + +epiphany-browser (1.4.6-1) unstable; urgency=low + + * New upstream release. + - fix tabs menu ordering when using the tab groups extension + (closes: #276916). + * debian/patches/03_ac_init.patch: update. + + -- Jordi Mallach <jordi@debian.org> Thu, 2 Dec 2004 00:16:32 +0100 + +epiphany-browser (1.4.5-2) unstable; urgency=low + + * Upload to unstable. + * debian/control.in: + - put myself as Maintainer. *shiver*. + - remove Mark Howard from uploaders, as he's trying to get galeon + adopted. + - remove build-dep on libc6-dev. + - bump to debhelper (>= 4.2.23). + + -- Jordi Mallach <jordi@debian.org> Fri, 19 Nov 2004 18:34:26 +0100 + +epiphany-browser (1.4.5-1) experimental; urgency=low + + * GNOME team upload. + * New upstream release. + * debian/{epiphany.1,epiphany-browser.mapages}: removed, included upstream. + * debian/patches/03_ac_init.patch: update. + + -- Jordi Mallach <jordi@debian.org> Tue, 16 Nov 2004 02:35:22 +0100 + +epiphany-browser (1.4.4-2) experimental; urgency=low + + * debian/control.in: + - bump cdbs and debhelper requirements, to register epiphany in the + MIME database. + - drop libtool build dependency. + * debian/postrm: remove, handled by debhelper. + * debian/rules: don't relibtoolize on pre-build. + + -- Jordi Mallach <jordi@debian.org> Tue, 9 Nov 2004 20:38:48 +0100 + +epiphany-browser (1.4.4-1) experimental; urgency=low + + * GNOME team upload. + * New upstream release. + * debian/rules: + + remove extra configure flags which aren't needed anymore. + + remove empty /usr/lib/epiphany. + * debian/patches/03_ac_init.patch: update. + + -- Jordi Mallach <jordi@debian.org> Wed, 13 Oct 2004 00:23:27 +0200 + +epiphany-browser (1.4.0-2) experimental; urgency=low + + * GNOME team upload. + * debian/rules: + + don't install /usr/bin/epiphany as a wrapper anymore, according + to Crispin it's not needed anymore (closes: #271986). + + configure with --with-mozilla-snapshot=1.7.2 to workaround a build + failure. + * debian/control.in: tighten mozilla dependencies to 1.7.3. + + -- Jordi Mallach <jordi@debian.org> Fri, 24 Sep 2004 19:28:26 +0200 + +epiphany-browser (1.4.0-1) experimental; urgency=low + + * GNOME team upload. + * New upstream release. + * debian/control.in: update build-depends as per configure.in. + * debian/patches/03_ac_init.patch: update. + * debian/rules: epiphany's binary is now epiphany, not epiphany-bin. + + -- Jordi Mallach <jordi@debian.org> Wed, 15 Sep 2004 23:30:24 +0200 + +epiphany-browser (1.2.9-2) unstable; urgency=low + + * GNOME team upload. + * debian/rules: configure using --with-mozilla-snapshot=1.7.2. + + -- Jordi Mallach <jordi@debian.org> Thu, 21 Oct 2004 11:29:46 +0200 + +epiphany-browser (1.2.9-1) unstable; urgency=low + + * GNOME team upload, by request of Edd. + * New upstream release. + * debian/patches/03_ac_init.patch: updated. + * debian/epiphany.1: apply patch from Andrew Sobala to remove + obsolete/unuseful options from the manpage, thanks! (Closes: #256504) + * debian/rules: don't libtoolize the package automatically in pre-build. + * debian/control.in: drop build-dependency on libtool. + + -- Jordi Mallach <jordi@debian.org> Thu, 21 Oct 2004 00:13:39 +0200 + +epiphany-browser (1.2.8-1) unstable; urgency=high + + * New upstream release. + * Really build against Mozilla 1.7.2. (Closes: #266265) + * High urgency to ensure that middle- and right-mouse clicks + work in the version that ships with sarge. + * Retire 01_package_name.patch, add 03_ac_init.patch to adjust + package name to epiphany-browser. + + -- Edd Dumbill <ejad@debian.org> Mon, 23 Aug 2004 19:19:25 +0100 + +epiphany-browser (1.2.7-2) unstable; urgency=low + + * Force compile against mozilla 1.7.2, fixes mouse button problems + (Closes: #264467) + + -- Edd Dumbill <ejad@debian.org> Mon, 9 Aug 2004 09:43:04 +0100 + +epiphany-browser (1.2.7-1) unstable; urgency=low + + * New upstream release + - build fine with mozilla 1.7.1. + * debian/epiphany-browser.postinst: + - removed the gconf and scrollkeeper parts, CDBS handles this. + * debian/epiphany-browser.postrm: + - removed, CDBS handles this too. + * debian/patches/01_package_name.patch: + - updated. + * debian/rules: + - changed the rules order to get dh_gconf used. + * All the above from Sebastien Bacher <seb128@debian.org>, thanks! + (Closes: #263841) + * Removed mozilla-xft from Recommends, this now included in + mozilla-browser. + + -- Edd Dumbill <ejad@debian.org> Fri, 7 Aug 2004 00:47:03 +0100 + +epiphany-browser (1.2.6-3) unstable; urgency=low + + * Add note to README.Debian to explain about the printing snafu. + * Move gtk-doc output into -dev package. + + -- Edd Dumbill <ejad@debian.org> Fri, 25 Jun 2004 10:17:53 +0100 + +epiphany-browser (1.2.6-2) unstable; urgency=low + + * Build against Mozilla 1.7. + + -- Edd Dumbill <ejad@debian.org> Thu, 24 Jun 2004 01:04:15 +0100 + +epiphany-browser (1.2.6-1) unstable; urgency=low + + * New upstream release. + - Fixes LD_LIBRARY_PATH setting (Closes: #253443) + + -- Edd Dumbill <ejad@debian.org> Mon, 14 Jun 2004 15:14:48 +0100 + +epiphany-browser (1.2.5-2) unstable; urgency=low + + * Upload to unstable. + - Download behavior fixed (Closes: #223591) + - Upload path remembered (Closes: #207829) + - Bookmark searches now case insensitive (Closes: #192929) + - Toolbars options in fullscreen not an issue now (Closes: #203018) + - Import bookmarks dialog offers arbitrary file import (Closes: #209224) + - Spinner no longer part of toolbar (Closes: #229548) + - Closing windows asks for confirmation if they have unsubmitted form + data (Closes: #229588) + * Don't break x-www-browser alternative on uninstall (Closes: #241535) + + -- Edd Dumbill <ejad@debian.org> Fri, 28 May 2004 07:55:32 +0100 + +epiphany-browser (1.2.5-1) experimental; urgency=low + + * New upstream release. + * Added Section: devel to control file for the -dev package. + + -- Edd Dumbill <ejad@debian.org> Wed, 5 May 2004 19:58:54 +0100 + +epiphany-browser (1.2.3-1) experimental; urgency=low + + * New upstream release. + * Add missing libxml-parser-perl builddep. + + -- Edd Dumbill <ejad@debian.org> Fri, 23 Apr 2004 18:24:54 +0100 + +epiphany-browser (1.2.2-3) experimental; urgency=low + + * Add missing gnome-pkg-tools builddep (Closes: #244053) + * Tighten up libtool builddep. + + -- Edd Dumbill <ejad@debian.org> Tue, 13 Apr 2004 10:11:52 +0100 + +epiphany-browser (1.2.2-2) experimental; urgency=low + + * Rebuild against gcc-3.3 not 3.4! + + -- Edd Dumbill <ejad@debian.org> Tue, 13 Apr 2004 09:07:02 +0100 + +epiphany-browser (1.2.2-1) experimental; urgency=low + + * New upstream release. + * Split into epiphany and epiphany-dev. + * Remove alternative in prerm. + + -- Edd Dumbill <ejad@debian.org> Mon, 12 Apr 2004 21:23:52 +0100 + +epiphany-browser (1.2.1-1) experimental; urgency=low + + * New upstream release. + * Updated patches for executable path, removed 04_scrollkeeper_omf patch. + * Remove libnautilus2-dev dependency for now, disable nautilus view + building. + + -- Edd Dumbill <ejad@debian.org> Wed, 24 Mar 2004 15:16:27 +0000 + +epiphany-browser (1.0.8-1) unstable; urgency=low + + * New upstream release. + * Get path right for translated docs (Closes: #231731) + * Make x-www-browser alternative greater than that of Mozilla's + (Closes: #233607) + * Drop yelp to a recommendation (Closes: #229061) + + -- Edd Dumbill <ejad@debian.org> Thu, 18 Mar 2004 13:54:23 +0000 + +epiphany-browser (1.0.7-3) unstable; urgency=low + + * Add libxml2-dev build-dep (Closes: #222453). Tighten the libbonoboui-dev + dependency as well. + * Add simple manpage (Closes: #206702, #221710) + + -- Edd Dumbill <ejad@debian.org> Sun, 25 Jan 2004 18:42:59 +0000 + +epiphany-browser (1.0.7-2) unstable; urgency=low + + * Add libxml-parser-perl as build-dep. Oops. + + -- Edd Dumbill <ejad@debian.org> Fri, 23 Jan 2004 11:52:12 +0000 + +epiphany-browser (1.0.7-1) unstable; urgency=low + + * New upstream release. + * Compile against Mozilla 1.6 (Closes: #229139) + + -- Edd Dumbill <ejad@debian.org> Fri, 23 Jan 2004 09:59:47 +0000 + +epiphany-browser (1.0.6-2) unstable; urgency=low + + * Add GNOME team maintainership stuff. + + -- Edd Dumbill <ejad@debian.org> Tue, 18 Nov 2003 12:26:28 +0000 + +epiphany-browser (1.0.6-1) unstable; urgency=low + + * New upstream release. + * Retire 05_file_uri_security.patch. + + -- Edd Dumbill <ejad@debian.org> Mon, 17 Nov 2003 15:04:01 +0000 + +epiphany-browser (1.0.3-3) unstable; urgency=low + + * Added Conflicts: mozilla-browser >= 1.6 to avoid future snafus + with Mozilla upgrades. + + -- Edd Dumbill <ejad@debian.org> Wed, 22 Oct 2003 09:54:52 +0100 + +epiphany-browser (1.0.3-2) unstable; urgency=low + + * Re-libtoolize to get round breakage with Mozilla 1.5. (Thanks + to Matt Biddulph for helping chase this down.) + + -- Edd Dumbill <ejad@debian.org> Wed, 22 Oct 2003 00:36:52 +0100 + +epiphany-browser (1.0.3-1) unstable; urgency=low + + * New upstream release. + + -- Edd Dumbill <ejad@debian.org> Sat, 18 Oct 2003 12:47:51 +0100 + +epiphany-browser (1.0.1-1) unstable; urgency=low + + * New upstream release. + + -- Edd Dumbill <ejad@debian.org> Mon, 13 Oct 2003 23:10:00 +0100 + +epiphany-browser (1.0-1) unstable; urgency=low + + * New upstream release. Epiphany goes 1.0! + * Add missing libgnome-desktop-dev build-dep (Closes: #211447) + * Use perl instead of sed in debian/rules (Closes: #207735) + * Remove glib2 autotools workaround, set specific libglib2.0-dev + dependency. + * Add in security fix from CVS so file:/// URIs can't be loaded + by pages retrieved from the network (05_file_uri_security.patch). + + -- Edd Dumbill <ejad@debian.org> Thu, 18 Sep 2003 15:41:56 +0100 + +epiphany-browser (0.9.2-2) unstable; urgency=low + + * Added Recommends: for mozilla-xft. + * Added note about mozilla-xft in README.Debian. + + -- Edd Dumbill <ejad@debian.org> Wed, 17 Sep 2003 09:33:52 +0100 + +epiphany-browser (0.9.2-1) unstable; urgency=low + + * New upstream release. + * Depend on gnome-icon-theme >= 1.0.6 now it's released. Thanks Kitame. + (Closes: #207368, #206297) + * Ensure locale location bugfix won't break when glib 2.0 bug which is the + root cause gets fixed. + + -- Edd Dumbill <ejad@debian.org> Thu, 28 Aug 2003 14:45:03 +0100 + +epiphany-browser (0.8.4-2) unstable; urgency=low + + * Move locale .mo files to the right place (Closes: #205304) + + -- Edd Dumbill <ejad@debian.org> Thu, 14 Aug 2003 08:51:06 +0100 + +epiphany-browser (0.8.4-1) unstable; urgency=low + + * New upstream release. + - New tab doesn't grab focus (Closes: #204829) + * Retire patches/05_sign_compile.patch. + * Retire gcc-3.2 dependency, compiles OK with 3.3 now. + + -- Edd Dumbill <ejad@debian.org> Wed, 13 Aug 2003 13:49:35 +0100 + +epiphany-browser (0.8.0-2) unstable; urgency=low + + * Depend on Mozilla 1.4 (Closes: #202069) + + -- Edd Dumbill <ejad@debian.org> Sat, 19 Jul 2003 15:40:03 +0100 + +epiphany-browser (0.8.0-1) unstable; urgency=low + + * New upstream release. + - No more "feeling lucky" + * Move debconf notice into NEWS.Debian (Closes: #201477). Updated + corresponding debhelper dependency to >= 4.1.51. + * Tweak wrapper script to change arguments to simply "$@". + + -- Edd Dumbill <ejad@debian.org> Fri, 18 Jul 2003 17:20:35 +0100 + +epiphany-browser (0.7.3-1) unstable; urgency=low + + * New upstream release. + - Fixes segfault on Mozilla bookmark import (Closes: #198556) + * Build against Mozilla 1.4 (Closes: #190763) + + -- Edd Dumbill <ejad@debian.org> Mon, 14 Jul 2003 21:52:03 +0100 + +epiphany-browser (0.7.1-1) unstable; urgency=low + + * New upstream release. (Closes: #198818) + - Don't crash on adding bookmark without topics (Closes: #197493) + - Search now works after smart bookmark use (Closes: #194208) + - Adding bookmark topic now works properly (Closes: #197869) + - Copy function works properly (Closes: #195357) + - Middle-click paste of keyword now shows proper new URL in + location bar (Closes: #195427) + - Creating new tab now doesn't destroy X selection (Closes: #197227) + * Download directory now remembered (Closes: #196927) + * Retire 02_help_dtd_patch as cdbs makes these corrections now + (Closes: #198181) + * Compile with gcc-3.2, remove -Wno-strict-aliasing (Closes: #197102) + I know this isn't the best-ever solution to this problem. Working + on sorting it out more permanently. + * Retire 05_valist_patch_from_bugzilla.patch, now in upstream + * Added debconf note: upstream have reorganized prefs schema, some of your + preferences will need resetting. + * Depend on gnome-icon-theme >= 1.0.4 (Closes: #197183). If you're still + have trouble with the throbber missing, file a bug on the theme, as + this seems to be theme dependent. + + -- Edd Dumbill <ejad@debian.org> Fri, 27 Jun 2003 16:05:49 +0100 + +epiphany-browser (0.7.0-1) unstable; urgency=low + + * New upstream release. + - Fixes crash on pause download (Closes: #193672) + - Fix smart bookmark non-ASCII problem (Closes: #193981) + * Incorporate 05_valist_patch_from_bugzilla.patch, which fixes + valist usage problems on several platforms. + + -- Edd Dumbill <ejad@debian.org> Sat, 7 Jun 2003 11:15:12 +0100 + +epiphany-browser (0.6.1-1) unstable; urgency=low + + * New upstream (Closes: #194423) + - adds 'remove toolbar' context menu (Closes: #190817) + * Get correct Mozilla dependency (Closes: #193999) + * Change menu hint to "Web browsers" (Closes: #193451) + * Update standards version to 3.5.9 + * Retire CVS Colin's Build System in favour of cdbs + + -- Edd Dumbill <ejad@debian.org> Sun, 25 May 2003 16:49:06 +0100 + +epiphany-browser (0.6.0-3) unstable; urgency=low + + * 05_eel_gconf_ptrsize.patch, add another ia64 fix. Hopefully + this is the final one. + + -- Edd Dumbill <ejad@debian.org> Wed, 14 May 2003 16:12:50 +0100 + +epiphany-browser (0.6.0-2) unstable; urgency=low + + * Moved mozilla-xft dependency to Recommends (Closes: #192895) + * Distribute NEWS file (Closes: #192836) + * Add 05_eel_gconf_ptrsize.patch from CVS to fix ia64 build error. + + -- Edd Dumbill <ejad@debian.org> Tue, 13 May 2003 09:54:14 +0100 + +epiphany-browser (0.6.0-1) unstable; urgency=low + + * New upstream release. + + Remote tab open raises window (Closes: #187663) + * Removed 03_guint_fix_from_cvs.patch, obsoleted by new release. + + -- Edd Dumbill <ejad@debian.org> Fri, 9 May 2003 14:53:25 +0100 + +epiphany-browser (0.5.0-rel-4) unstable; urgency=low + + * Really fix path of help docs in .omf file (Closes: #191282) + + -- Edd Dumbill <ejad@debian.org> Sat, 3 May 2003 16:11:28 +0100 + +epiphany-browser (0.5.0-rel-3) unstable; urgency=low + + * 04_scrollkeeper_omf_path.patch: try to fix path of help file in .omf + file + * debian/rules: update to latest version of Colin's Build System + * debian/rocks: add -fshort-wchar to CXXFLAGS, fixes problem with + context menus on images. + + -- Edd Dumbill <ejad@debian.org> Tue, 29 Apr 2003 20:44:06 +0100 + +epiphany-browser (0.5.0-rel-2) unstable; urgency=low + + * Fix missing bookmark editor icon problem. + + -- Edd Dumbill <ejad@debian.org> Thu, 24 Apr 2003 16:53:58 +0100 + +epiphany-browser (0.5.0-rel-1) unstable; urgency=low + + * New upstream release. I won't be tracking CVS snapshots any + more. (Closes: #189413) + * Compile against mozilla rather than mozilla-snapshot. (Closes: #182199) + * Changed section to 'gnome'. + * Adjusted alternatives priority for x-www-browser to 75. + * 64-bit arch compile patch from CVS (Closes: #190011) + + -- Edd Dumbill <ejad@debian.org> Tue, 22 Apr 2003 19:23:57 +0100 + +epiphany-browser (0.5.0+0.4.99.20030304-1) unstable; urgency=low + + * New CVS export. + + -- Edd Dumbill <ejad@debian.org> Tue, 4 Mar 2003 23:38:46 +0000 + +epiphany-browser (0.5.0+0.4.99.20030220-3) unstable; urgency=low + + * Exchanged faulty gconf dependency for gconf2. + + -- Edd Dumbill <ejad@debian.org> Fri, 21 Feb 2003 23:05:02 +0000 + +epiphany-browser (0.5.0+0.4.99.20030220-2) unstable; urgency=low + + * Added debian menu entry. + + -- Edd Dumbill <ejad@debian.org> Fri, 21 Feb 2003 10:36:03 +0000 + +epiphany-browser (0.5.0+0.4.99.20030220-1) unstable; urgency=low + + * New CVS export. + + -- Edd Dumbill <ejad@debian.org> Thu, 20 Feb 2003 15:28:02 +0000 + +epiphany-browser (0.5.0+0.4.99.20030214-6) unstable; urgency=low + + * Added www-browser to Provides: + * Added to the x-www-browser alternatives selection. + + -- Edd Dumbill <ejad@debian.org> Wed, 19 Feb 2003 13:07:26 +0000 + +epiphany-browser (0.5.0+0.4.99.20030214-5) unstable; urgency=low + + * Upload to Debian, co-maintained with Mark Howard (Closes: #173427) + + -- Edd Dumbill <ejad@debian.org> Sun, 16 Feb 2003 21:40:49 +0000 + +epiphany-browser (0.5.0+0.4.99.20030214-4) unstable; urgency=low + + * Versioned various dependencies. + * Added gconf dependency. + * Moved epiphany binary to /usr/lib/epiphany/ + * Revert binary name to 'epiphany' + * Clean up after intltool: -extract, -merge, -update + * Added in location of CVS source into debian/copyright + + -- Edd Dumbill <ejad@debian.org> Sun, 16 Feb 2003 14:19:01 +0000 + +epiphany-browser (0.5.0+0.4.99.20030214-3) unstable; urgency=low + + * Added mozilla-psm-snapshot as a dependency. + + -- Edd Dumbill <ejad@debian.org> Sat, 15 Feb 2003 03:41:56 +0000 + +epiphany-browser (0.5.0+0.4.99.20030214-2) unstable; urgency=low + + * Changed package name to epiphany-browser in the configure + script. + + -- Edd Dumbill <ejad@debian.org> Sat, 15 Feb 2003 03:41:56 +0000 + +epiphany-browser (0.5.0+0.4.99.20030214-1) unstable; urgency=low + + * Initial packaging from CVS. + + -- Edd Dumbill <ejad@debian.org> Fri, 14 Feb 2003 23:05:40 +0000 + --- epiphany-browser-2.21.90.orig/debian/epiphany-gecko.postinst +++ epiphany-browser-2.21.90/debian/epiphany-gecko.postinst @@ -0,0 +1,12 @@ +#!/bin/sh +set -e + +for alt in epiphany-browser x-www-browser gnome-www-browser; do + update-alternatives --install \ + /usr/bin/$alt $alt /usr/bin/epiphany-gecko 85 \ + --slave /usr/share/man/man1/$alt.1.gz $alt.1.gz /usr/share/man/man1/epiphany-gecko.1.gz +done + +#DEBHELPER# + +exit 0 --- epiphany-browser-2.21.90.orig/debian/epiphany-browser-data.dirs +++ epiphany-browser-2.21.90/debian/epiphany-browser-data.dirs @@ -0,0 +1,2 @@ +/etc/gnome/epiphany +/usr --- epiphany-browser-2.21.90.orig/debian/epiphany-webkit.prerm +++ epiphany-browser-2.21.90/debian/epiphany-webkit.prerm @@ -0,0 +1,12 @@ +#!/bin/sh +set -e + +if [ "$1" = "remove" ] || [ "$1" = "deconfigure" ] ; then + for alt in epiphany-browser x-www-browser gnome-www-browser; do + update-alternatives --remove $alt /usr/bin/epiphany-webkit + done +fi + +#DEBHELPER# + +exit 0 --- epiphany-browser-2.21.90.orig/debian/epiphany-browser-data.links +++ epiphany-browser-2.21.90/debian/epiphany-browser-data.links @@ -0,0 +1,2 @@ +/etc/gnome/epiphany/mime-types-permissions.xml /usr/share/epiphany-browser/mime-types-permissions.xml +/etc/gnome/epiphany/default-prefs.js /usr/share/epiphany-browser/default-prefs.js --- epiphany-browser-2.21.90.orig/debian/control.in +++ epiphany-browser-2.21.90/debian/control.in @@ -0,0 +1,114 @@ +Source: epiphany-browser +Section: gnome +Priority: optional +Maintainer: Ubuntu Desktop Team <ubuntu-desktop@lists.ubuntu.com> +XSBC-Original-Maintainer: Josselin Mouette <joss@debian.org> +Uploaders: @GNOME_TEAM@ +Build-Depends: debhelper (>= 5), + pkg-config, + libglib2.0-dev (>= 2.13.4), + libgtk2.0-dev (>= 2.11.6), + libxml2-dev (>= 2.6.12), + libxslt1-dev (>= 1.1.7), + libglade2-dev (>= 2.3.1), + libgnome2-dev (>= 2.14.0), + libgnomeui-dev (>= 2.16.0-2), + libgconf2-dev, + libgnome-desktop-dev (>= 2.9.91), + libstartup-notification0-dev (>= 0.5), + libdbus-glib-1-dev (>= 0.60), + scrollkeeper, + gnome-pkg-tools (>= 0.10), + libxml-parser-perl, + xulrunner-1.9-dev (>= 1.9~b3~), + iso-codes (>= 0.35), + python-dev (>= 2.3), + python-gtk2-dev (>= 2.7.1), + python-gnome2-dev (>= 2.6.0), + gnome-doc-utils (>= 0.3.2), + intltool (>= 0.35.0), + x11proto-core-dev, + network-manager-dev, + quilt, + libenchant-dev (>= 1.0), + gtk-doc-tools (>= 1.0), + liblaunchpad-integration-dev, + libavahi-gobject-dev +Standards-Version: 3.7.2 + +Package: epiphany-browser +Architecture: all +Depends: epiphany-gecko | epiphany-webkit +Description: Intuitive web browser - dummy package + Epiphany is a simple yet powerful GNOME web browser targeted at + non-technical users. Its principles are simplicity and standards + compliance. + . + This dummy package installs Epiphany with the Gecko backend by default. + +Package: epiphany-gecko +Architecture: any +Depends: epiphany-browser-data (>= ${gnome:Version}), + epiphany-browser-data (<< ${gnome:NextVersion}), + ${shlibs:Depends}, + gnome-icon-theme (>= 2.9.90), + dbus, + iso-codes, + xulrunner-1.9 (>= 1.9~b3~), + ${misc:Depends} +Conflicts: epiphany-browser (<< 2.20.1-2ubuntu1) +Recommends: yelp, epiphany-extensions +Breaks: epiphany-extensions (<< 2.20.1-2ubuntu3) +Suggests: mozplugger +Provides: www-browser, gnome-www-browser +Description: Intuitive GNOME web browser - Gecko version + Epiphany is a simple yet powerful GNOME web browser targeted at + non-technical users. Its principles are simplicity and standards + compliance. Simplicity is achieved by a well designed user interface and + reliance on external applications for performing external tasks (such as + reading email). Simplicity should not mean less powerful. Standards + compliance is achieved on the HTML side by using the Gecko + rendering engine, as developed for the Mozilla and Firefox browsers; and + on the user interface side by closely following the GNOME Human Interface + Guidelines (HIG) and by close integration with the GNOME desktop. + . + This version uses the Gecko backend to render web pages. + . + Homepage: http://www.gnome.org/projects/epiphany/ + +Package: epiphany-browser-data +Architecture: all +Depends: ${misc:Depends} +Recommends: epiphany-browser +Conflicts: epiphany-browser (<< 2.20.1-2ubuntu1) +Replaces: epiphany-browser (<< 2.20.1-2ubuntu1) +Description: Data files for the GNOME web browser + Epiphany is a simple yet powerful GNOME web browser targeted at + non-technical users. Its principles are simplicity and standards + compliance. + . + This package contains the common files, artwork and translations for + Epiphany. + +Package: epiphany-browser-dev +Architecture: all +Section: devel +Depends: epiphany-gecko (>= ${binary:Version}), libgnomeui-dev (>= 2.16.0-2) +Description: Development files for the GNOME web browser + Epiphany is a simple yet powerful GNOME web browser targeted at + non-technical users. Its principles are simplicity and standards + compliance. + . + This package is required to develop extensions for Epiphany. + +Package: epiphany-browser-dbg +Architecture: any +Section: gnome +Priority: extra +Depends: epiphany-gecko (= ${binary:Version}) | epiphany-webkit (= ${binary:Version}) +Description: Debugging symbols for the GNOME web browser + Epiphany is a simple yet powerful GNOME web browser targeted at + non-technical users. Its principles are simplicity and standards + compliance. + . + This package contains detached debugging symbols. --- epiphany-browser-2.21.90.orig/debian/epiphany-browser-data.docs +++ epiphany-browser-2.21.90/debian/epiphany-browser-data.docs @@ -0,0 +1,4 @@ +NEWS +README +TODO +AUTHORS --- epiphany-browser-2.21.90.orig/debian/compat +++ epiphany-browser-2.21.90/debian/compat @@ -0,0 +1 @@ +5 --- epiphany-browser-2.21.90.orig/debian/epiphany-webkit.postinst +++ epiphany-browser-2.21.90/debian/epiphany-webkit.postinst @@ -0,0 +1,12 @@ +#!/bin/sh +set -e + +for alt in epiphany-browser x-www-browser gnome-www-browser; do + update-alternatives --install \ + /usr/bin/$alt $alt /usr/bin/epiphany-webkit 80 \ + --slave /usr/share/man/man1/$alt.1.gz $alt.1.gz /usr/share/man/man1/epiphany-webkit.1.gz +done + +#DEBHELPER# + +exit 0