r15911 - in /desktop/experimental/seahorse/debian: changelog control patches/09_gecko_1.9.patch patches/10_ephyembed_api.patch patches/10_relibtoolize.patch patches/70_relibtoolize.patch patches/series
joss at users.alioth.debian.org
joss at users.alioth.debian.org
Mon May 12 16:12:12 UTC 2008
Author: joss
Date: Mon May 12 16:12:12 2008
New Revision: 15911
URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=15911
Log:
* 09_gecko_1.9.patch: replace gecko.m4 by a more recent version that
supports gecko 1.9, and add support for libxul in configure.in.
* Use this libxul variant. Closes: #480819.
* Move 10_relibtoolize.patch to 70_relibtoolize.patch and refresh it.
* 10_ephyembed_api.patch: fixes for the EphyEmbed API to make the
extension work again. Includes fix for the implicit conversion.
Closes: #477113.
Added:
desktop/experimental/seahorse/debian/patches/09_gecko_1.9.patch
desktop/experimental/seahorse/debian/patches/10_ephyembed_api.patch
desktop/experimental/seahorse/debian/patches/70_relibtoolize.patch
- copied, changed from r15904, desktop/experimental/seahorse/debian/patches/10_relibtoolize.patch
Removed:
desktop/experimental/seahorse/debian/patches/10_relibtoolize.patch
Modified:
desktop/experimental/seahorse/debian/changelog
desktop/experimental/seahorse/debian/control
desktop/experimental/seahorse/debian/patches/series
Modified: desktop/experimental/seahorse/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/seahorse/debian/changelog?rev=15911&op=diff
==============================================================================
--- desktop/experimental/seahorse/debian/changelog (original)
+++ desktop/experimental/seahorse/debian/changelog Mon May 12 16:12:12 2008
@@ -1,9 +1,16 @@
-seahorse (2.22.1-3) UNRELEASED; urgency=low
+seahorse (2.22.1-3) experimental; urgency=low
* Target to experimental; include check-dist.
* Require epiphany-browser-dev 2.22.1.1-2 and xulrunner-dev 1.9~b5-3.
-
- -- Josselin Mouette <joss at debian.org> Mon, 12 May 2008 15:17:36 +0200
+ * 09_gecko_1.9.patch: replace gecko.m4 by a more recent version that
+ supports gecko 1.9, and add support for libxul in configure.in.
+ * Use this libxul variant. Closes: #480819.
+ * Move 10_relibtoolize.patch to 70_relibtoolize.patch and refresh it.
+ * 10_ephyembed_api.patch: fixes for the EphyEmbed API to make the
+ extension work again. Includes fix for the implicit conversion.
+ Closes: #477113.
+
+ -- Josselin Mouette <joss at debian.org> Mon, 12 May 2008 15:42:25 +0200
seahorse (2.22.1-2) unstable; urgency=low
Modified: desktop/experimental/seahorse/debian/control
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/seahorse/debian/control?rev=15911&op=diff
==============================================================================
--- desktop/experimental/seahorse/debian/control (original)
+++ desktop/experimental/seahorse/debian/control Mon May 12 16:12:12 2008
@@ -24,9 +24,9 @@
libgnome-keyring-dev,
libglib2.0-dev (>= 2.10.0),
libgtk2.0-dev (>= 2.10.0),
- epiphany-browser-dev (>= 2.14),
+ epiphany-browser-dev (>= 2.22.1.1-2),
libxml2-dev (>= 2.6.0),
- libxul-dev (>= 1.8),
+ xulrunner-dev (>= 1.9~b5-3),
libebook1.2-dev (>= 1.7.90),
libgnomevfs2-dev,
gnome-pkg-tools
Added: desktop/experimental/seahorse/debian/patches/09_gecko_1.9.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/seahorse/debian/patches/09_gecko_1.9.patch?rev=15911&op=file
==============================================================================
--- desktop/experimental/seahorse/debian/patches/09_gecko_1.9.patch (added)
+++ desktop/experimental/seahorse/debian/patches/09_gecko_1.9.patch Mon May 12 16:12:12 2008
@@ -1,0 +1,407 @@
+Index: seahorse-2.22.1/m4/gecko.m4
+===================================================================
+--- seahorse-2.22.1.orig/m4/gecko.m4 2008-05-12 15:28:26.108432200 +0200
++++ seahorse-2.22.1/m4/gecko.m4 2008-05-12 15:55:26.256433917 +0200
+@@ -1,5 +1,5 @@
+-# Copyright (C) 2000-2004 Marco Pesenti Gritti
+-# Copyright (C) 2003, 2004, 2005, 2006 Christian Persch
++# Copyright © 2000-2004 Marco Pesenti Gritti
++# Copyright © 2003, 2004, 2005, 2006 Christian Persch
+ #
+ # This program is free software; you can redistribute it and/or modify it
+ # under the terms of the GNU General Public License as published by the
+@@ -13,7 +13,7 @@
+ #
+ # You should have received a copy of the GNU General Public License along
+ # with this program; if not, write to the Free Software Foundation, Inc.,
+-# 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
++# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+
+ # GECKO_INIT(VARIABLE,[ACTION-IF-FOUND],[ACTION-IF-NOT-FOUND])
+ #
+@@ -32,6 +32,7 @@
+ # 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
+@@ -51,7 +52,7 @@ AC_PROG_AWK
+ 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
+@@ -60,12 +61,15 @@ AC_ARG_WITH([mozilla],[],[with_gecko=$wi
+ gecko_cv_gecko=$with_gecko
+
+ # Autodetect gecko
+-_geckos="firefox mozilla-firefox seamonkey mozilla xulrunner"
++_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
+@@ -76,12 +80,20 @@ 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])
++ 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
+ # ****************
+@@ -93,25 +105,38 @@ 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_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
+
+-AM_CONDITIONAL([HAVE_MOZILLA_TOOLKIT],[test "$gecko_cv_gecko_flavour" = "toolkit"])
+-
+ $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
+@@ -182,7 +207,7 @@ if test "$gecko_cv_have_gecko" = "yes";
+ 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(
+@@ -215,6 +240,18 @@ AC_COMPILE_IFELSE(
+ [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++])
+@@ -226,9 +263,11 @@ if test "$gecko_cv_have_debug" = "yes";
+ AC_DEFINE([HAVE_GECKO_DEBUG],[1],[Define if gecko is a debug build])
+ fi
+
+-fi # if gecko_cv_have_gecko
++if test "$gecko_cv_have_xpcom_glue" = "yes"; then
++ AC_DEFINE([HAVE_GECKO_XPCOM_GLUE],[1],[Define if xpcom glue is used])
++fi
+
+-AM_CONDITIONAL([HAVE_GECKO_DEBUG],[test "$gecko_cv_have_debug" = "yes"])
++fi # if gecko_cv_have_gecko
+
+ # ***********************
+ # Check for gecko version
+@@ -239,7 +278,7 @@ if test "$gecko_cv_have_gecko" = "yes";
+ 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],
+@@ -309,11 +348,6 @@ fi
+
+ fi # if gecko_cv_have_gecko
+
+-AM_CONDITIONAL([HAVE_GECKO_1_7],[test "$gecko_cv_gecko_version_int" -ge "1007000"])
+-AM_CONDITIONAL([HAVE_GECKO_1_8],[test "$gecko_cv_gecko_version_int" -ge "1008000"])
+-AM_CONDITIONAL([HAVE_GECKO_1_8_1],[test "$gecko_cv_gecko_version_int" -ge "1008001"])
+-AM_CONDITIONAL([HAVE_GECKO_1_9],[test "$gecko_cv_gecko_version_int" -ge "1009000"])
+-
+ $1[]_VERSION=$gecko_cv_gecko_version
+ $1[]_VERSION_INT=$gecko_cv_gecko_version_int
+
+@@ -322,17 +356,46 @@ $1[]_VERSION_INT=$gecko_cv_gecko_version
+ # **************************************************
+
+ 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="-lxul"
++ 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"
++
++])
++
++# GECKO_DEFINES
++#
++# Defines the AM_CONDITIONALS for GECKO_INIT. This is a separate call
++# so that you may call GECKO_INIT conditionally; but note that you must
++# call GECKO_DEFINES _unconditionally_ !
+
++AC_DEFUN([GECKO_DEFINES],
++[
++# Ensure we have an integer variable to compare with
++if test -z "$gecko_cv_gecko_version_int"; then
++ 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"])
++AM_CONDITIONAL([HAVE_GECKO_DEBUG],[test "$gecko_cv_have_debug" = "yes"])
++AM_CONDITIONAL([HAVE_GECKO_XPCOM_GLUE],[test "$gecko_cv_have_xpcom_glue" = "yes"])
+ ])
+
+ # ***************************************************************************
+@@ -354,10 +417,20 @@ _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"
+
+@@ -366,9 +439,11 @@ _GECKO_DISPATCH_INCLUDEDIRS="$2"
+ # Mind you, it's useful to be able to test against uninstalled mozilla builds...
+ _GECKO_DISPATCH_INCLUDEDIRS="$_GECKO_DISPATCH_INCLUDEDIRS dom necko pref"
+
+-# 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,$@))
+@@ -421,11 +496,17 @@ AC_DEFUN([GECKO_XPCOM_PROGRAM],
+ #include <mozilla-config.h>
+ #include <stdlib.h>
+ #include <stdio.h>
++
++#ifdef XPCOM_GLUE
++#include <nsXPCOMGlue.h>
++#else
+ #include <nsXPCOM.h>
++#endif // XPCOM_GLUE
++
+ #include <nsCOMPtr.h>
+ #include <nsILocalFile.h>
+ #include <nsIServiceManager.h>
+-#ifdef HAVE_GECKO_1_8
++#if defined(HAVE_GECKO_1_8) || defined(HAVE_GECKO_1_9)
+ #include <nsStringAPI.h>
+ #else
+ #include <nsString.h>
+@@ -433,16 +514,37 @@ AC_DEFUN([GECKO_XPCOM_PROGRAM],
+ ]]
+ [$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<nsILocalFile> directory;
++nsCOMPtr<nsILocalFile> 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)) {
+@@ -590,21 +692,22 @@ fi
+ 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
+Index: seahorse-2.22.1/configure.in
+===================================================================
+--- seahorse-2.22.1.orig/configure.in 2008-05-12 16:16:05.112434003 +0200
++++ seahorse-2.22.1/configure.in 2008-05-12 16:35:07.276430182 +0200
+@@ -499,7 +499,8 @@ else
+ echo "enabling epiphany plugin..."
+
+ GECKO_INIT([MOZILLA],[with_epiphany_plugin=yes],[with_epiphany_plugin=no])
+-
++ GECKO_DEFINES
++
+ if test "$with_epiphany_plugin" = "yes"; then
+ AC_SUBST([MOZILLA])
+ AC_SUBST([MOZILLA_FLAVOUR])
+@@ -508,7 +509,7 @@ else
+ AC_SUBST([MOZILLA_INCLUDE_ROOT])
+
+ case "$MOZILLA" in
+- xulrunner) min_version=1.8 ;;
++ *xul*) min_version=1.8 ;;
+ *firefox) min_version=1.5 ;;
+ *) AC_MSG_ERROR([Unsupported gecko "$gecko_cv_gecko"]) ;;
+ esac
+@@ -590,11 +591,20 @@ else
+ fi
+
+ if test "$with_epiphany_plugin" = "yes"; then
+- PKG_CHECK_MODULES([MOZILLA_COMPONENT],
++ case "$gecko_cv_gecko" in
++ libxul*)
++ PKG_CHECK_MODULES([MOZILLA_COMPONENT],
++ [${gecko_cv_gecko} >= $min_version $gecko_cv_extra_pkg_dependencies],
++ [with_epiphany_plugin=yes],[with_epiphany_plugin=no echo "disabling epiphany plugin"])
++ ;;
++ *)
++ PKG_CHECK_MODULES([MOZILLA_COMPONENT],
+ [${gecko_cv_gecko}-xpcom >= $min_version $gecko_cv_extra_pkg_dependencies],
+ [with_epiphany_plugin=yes],[with_epiphany_plugin=no echo "disabling epiphany plugin"])
++ ;;
++ esac
+ fi
+-
++
+ if test "$with_epiphany_plugin" = "yes"; then
+ echo "enabling epiphany plugin"
+
Added: desktop/experimental/seahorse/debian/patches/10_ephyembed_api.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/seahorse/debian/patches/10_ephyembed_api.patch?rev=15911&op=file
==============================================================================
--- desktop/experimental/seahorse/debian/patches/10_ephyembed_api.patch (added)
+++ desktop/experimental/seahorse/debian/patches/10_ephyembed_api.patch Mon May 12 16:12:12 2008
@@ -1,0 +1,71 @@
+Index: seahorse-2.22.1/plugins/epiphany/mozilla/mozilla-helper.cpp
+===================================================================
+--- seahorse-2.22.1.orig/plugins/epiphany/mozilla/mozilla-helper.cpp 2008-05-12 17:32:09.160430561 +0200
++++ seahorse-2.22.1/plugins/epiphany/mozilla/mozilla-helper.cpp 2008-05-12 17:56:06.780429200 +0200
+@@ -78,7 +78,7 @@ extern "C" gboolean
+ mozilla_is_input (EphyEmbed *embed)
+ {
+ nsCOMPtr<nsIWebBrowser> browser;
+- gtk_moz_embed_get_nsIWebBrowser (GTK_MOZ_EMBED (embed),
++ gtk_moz_embed_get_nsIWebBrowser (GTK_MOZ_EMBED (gtk_bin_get_child (GTK_BIN (embed))),
+ getter_AddRefs (browser));
+ nsCOMPtr<nsIWebBrowserFocus> focus (do_QueryInterface(browser));
+ if (!focus) return FALSE;
+@@ -100,7 +100,7 @@ extern "C" const char*
+ mozilla_get_text (EphyEmbed *embed)
+ {
+ nsCOMPtr<nsIWebBrowser> browser;
+- gtk_moz_embed_get_nsIWebBrowser (GTK_MOZ_EMBED (embed),
++ gtk_moz_embed_get_nsIWebBrowser (GTK_MOZ_EMBED (gtk_bin_get_child (GTK_BIN (embed))),
+ getter_AddRefs (browser));
+ nsCOMPtr<nsIWebBrowserFocus> focus (do_QueryInterface(browser));
+ if (!focus)
+@@ -139,7 +139,7 @@ extern "C" void
+ mozilla_set_text (EphyEmbed *embed, char *new_text)
+ {
+ nsCOMPtr<nsIWebBrowser> browser;
+- gtk_moz_embed_get_nsIWebBrowser (GTK_MOZ_EMBED (embed),
++ gtk_moz_embed_get_nsIWebBrowser (GTK_MOZ_EMBED (gtk_bin_get_child (GTK_BIN (embed))),
+ getter_AddRefs (browser));
+ nsCOMPtr<nsIWebBrowserFocus> focus (do_QueryInterface(browser));
+ if (!focus) return;
+Index: seahorse-2.22.1/plugins/epiphany/seahorse-extension.c
+===================================================================
+--- seahorse-2.22.1.orig/plugins/epiphany/seahorse-extension.c 2008-05-12 17:32:33.852933642 +0200
++++ seahorse-2.22.1/plugins/epiphany/seahorse-extension.c 2008-05-12 17:41:45.216937696 +0200
+@@ -24,7 +24,7 @@
+ #include "mozilla/mozilla-helper.h"
+
+ #include <epiphany/ephy-extension.h>
+-#include <epiphany/ephy-embed.h>
++#include <epiphany/ephy-embed-container.h>
+
+ #include "eel-gconf-extensions.h"
+ #include "ephy-debug.h"
+@@ -239,7 +239,7 @@ encrypt_seahorse_cb (GtkAction *action,
+
+ init_crypt();
+
+- embed = ephy_window_get_active_embed (window);
++ embed = ephy_embed_container_get_active_child (EPHY_EMBED_CONTAINER (window));
+ g_return_if_fail (EPHY_IS_EMBED (embed));
+
+ /* ask gecko for the input */
+@@ -285,7 +285,7 @@ sign_seahorse_cb (GtkAction *action, Eph
+
+ init_crypt();
+
+- embed = ephy_window_get_active_embed (window);
++ embed = ephy_embed_container_get_active_child (EPHY_EMBED_CONTAINER (window));
+ g_return_if_fail (EPHY_IS_EMBED (embed));
+
+ /* ask gecko for the input */
+@@ -419,7 +419,7 @@ dvi_seahorse_cb (GtkAction *action, Ephy
+
+ init_crypt();
+
+- embed = ephy_window_get_active_embed (window);
++ embed = ephy_embed_container_get_active_child (EPHY_EMBED_CONTAINER (window));
+ g_return_if_fail (EPHY_IS_EMBED (embed));
+
+ /* ask gecko for the input */
Copied: desktop/experimental/seahorse/debian/patches/70_relibtoolize.patch (from r15904, desktop/experimental/seahorse/debian/patches/10_relibtoolize.patch)
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/seahorse/debian/patches/70_relibtoolize.patch?rev=15911&op=diff
==============================================================================
--- desktop/experimental/seahorse/debian/patches/10_relibtoolize.patch (original)
+++ desktop/experimental/seahorse/debian/patches/70_relibtoolize.patch Mon May 12 16:12:12 2008
@@ -1,19 +1,26 @@
-diff -x'*config.sub' -x'*config.guess' -Naur seahorse-2.22.1.old/aclocal.m4 seahorse-2.22.1/aclocal.m4
---- seahorse-2.22.1.old/aclocal.m4 2008-04-07 03:58:36.000000000 +0200
-+++ seahorse-2.22.1/aclocal.m4 2008-04-07 06:40:58.000000000 +0200
-@@ -494,7 +494,7 @@
+libtoolize --force --copy
+aclocal-1.10 -I m4
+automake-1.10
+autoconf
+
+Index: seahorse-2.22.1/aclocal.m4
+===================================================================
+--- seahorse-2.22.1.orig/aclocal.m4 2008-05-12 16:35:12.684931615 +0200
++++ seahorse-2.22.1/aclocal.m4 2008-05-12 16:35:46.928935552 +0200
+@@ -494,7 +494,7 @@ fi])
# libtool.m4 - Configure libtool for the host system. -*-Autoconf-*-
-# serial 52 Debian 1.5.26-1ubuntu1 AC_PROG_LIBTOOL
-+# serial 52 Debian 1.5.26-3 AC_PROG_LIBTOOL
++# serial 52 Debian 1.5.26-4 AC_PROG_LIBTOOL
# AC_PROVIDE_IFELSE(MACRO-NAME, IF-PROVIDED, IF-NOT-PROVIDED)
-diff -x'*config.sub' -x'*config.guess' -Naur seahorse-2.22.1.old/agent/Makefile.in seahorse-2.22.1/agent/Makefile.in
---- seahorse-2.22.1.old/agent/Makefile.in 2008-04-07 03:59:29.000000000 +0200
-+++ seahorse-2.22.1/agent/Makefile.in 2008-04-07 06:41:13.000000000 +0200
-@@ -57,7 +57,7 @@
+Index: seahorse-2.22.1/agent/Makefile.in
+===================================================================
+--- seahorse-2.22.1.orig/agent/Makefile.in 2008-05-12 16:35:12.632930423 +0200
++++ seahorse-2.22.1/agent/Makefile.in 2008-05-12 16:36:31.660428068 +0200
+@@ -57,7 +57,7 @@ am_seahorse_agent_OBJECTS = seahorse-age
seahorse_agent_OBJECTS = $(am_seahorse_agent_OBJECTS)
am__DEPENDENCIES_1 =
seahorse_agent_DEPENDENCIES = \
@@ -22,16 +29,16 @@
$(top_builddir)/libcryptui/libcryptui.la $(am__DEPENDENCIES_1)
DEFAULT_INCLUDES = -I. at am__isrc@ -I$(top_builddir)
depcomp = $(SHELL) $(top_srcdir)/depcomp
-@@ -241,8 +241,6 @@
- SHELL = @SHELL@
- SOUP_CFLAGS = @SOUP_CFLAGS@
- SOUP_LIBS = @SOUP_LIBS@
--SSH_KEYGEN_PATH = @SSH_KEYGEN_PATH@
--SSH_PATH = @SSH_PATH@
- STRIP = @STRIP@
- USE_NLS = @USE_NLS@
- VERSION = @VERSION@
-@@ -317,7 +315,7 @@
+@@ -241,8 +241,6 @@ SHARING_LIBS = @SHARING_LIBS@
+ SHELL = @SHELL@
+ SOUP_CFLAGS = @SOUP_CFLAGS@
+ SOUP_LIBS = @SOUP_LIBS@
+-SSH_KEYGEN_PATH = @SSH_KEYGEN_PATH@
+-SSH_PATH = @SSH_PATH@
+ STRIP = @STRIP@
+ USE_NLS = @USE_NLS@
+ VERSION = @VERSION@
+@@ -317,7 +315,7 @@ seahorse_agent_SOURCES = seahorse-agent.
seahorse-agent-io.c seahorse-agent-status.c
seahorse_agent_LDADD = \
@@ -40,10 +47,22 @@
$(top_builddir)/libcryptui/libcryptui.la \
$(SEAHORSE_LIBS)
-diff -x'*config.sub' -x'*config.guess' -Naur seahorse-2.22.1.old/configure seahorse-2.22.1/configure
---- seahorse-2.22.1.old/configure 2008-04-07 03:59:22.000000000 +0200
-+++ seahorse-2.22.1/configure 2008-04-07 06:41:10.000000000 +0200
-@@ -997,8 +997,6 @@
+Index: seahorse-2.22.1/configure
+===================================================================
+--- seahorse-2.22.1.orig/configure 2008-05-12 16:35:12.580930208 +0200
++++ seahorse-2.22.1/configure 2008-05-12 16:36:37.380428669 +0200
+@@ -970,6 +970,10 @@ 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
++HAVE_GECKO_XPCOM_GLUE_TRUE
++HAVE_GECKO_XPCOM_GLUE_FALSE
+ MOZILLA
+ MOZILLA_FLAVOUR
+ MOZILLA_HOME
+@@ -997,8 +1001,6 @@ WITH_APPLET_TRUE
WITH_APPLET_FALSE
LIBNOTIFY_CFLAGS
LIBNOTIFY_LIBS
@@ -52,174 +71,605 @@
WITH_SSH_TRUE
WITH_SSH_FALSE
LIBEBOOK_CFLAGS
-@@ -5034,7 +5032,7 @@
+@@ -1697,9 +1699,11 @@ Optional Packages:
+ list of formats
+ --with-nautilus-ext-dir=DIR
+ directory to nautilus extension config
+- --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
+
+ Some influential environment variables:
+ CC C compiler command
+@@ -5034,7 +5038,7 @@ ia64-*-hpux*)
;;
*-*-irix6*)
# Find out which ABI we are using.
- echo '#line 5037 "configure"' > conftest.$ac_ext
-+ echo '#line 5035 "configure"' > conftest.$ac_ext
++ echo '#line 5041 "configure"' > conftest.$ac_ext
if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
(eval $ac_compile) 2>&5
ac_status=$?
-@@ -8086,11 +8084,11 @@
+@@ -8086,11 +8090,11 @@ else
-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:8089: $lt_compile\"" >&5)
-+ (eval echo "\"\$as_me:8087: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:8093: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:8093: \$? = $ac_status" >&5
-+ echo "$as_me:8091: \$? = $ac_status" >&5
++ echo "$as_me:8097: \$? = $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.
-@@ -8376,11 +8374,11 @@
+@@ -8376,11 +8380,11 @@ else
-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:8379: $lt_compile\"" >&5)
-+ (eval echo "\"\$as_me:8377: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:8383: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:8383: \$? = $ac_status" >&5
-+ echo "$as_me:8381: \$? = $ac_status" >&5
++ echo "$as_me:8387: \$? = $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.
-@@ -8480,11 +8478,11 @@
+@@ -8480,11 +8484,11 @@ else
-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:8483: $lt_compile\"" >&5)
-+ (eval echo "\"\$as_me:8481: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:8487: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
- echo "$as_me:8487: \$? = $ac_status" >&5
-+ echo "$as_me:8485: \$? = $ac_status" >&5
++ echo "$as_me:8491: \$? = $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
-@@ -10857,7 +10855,7 @@
+@@ -10857,7 +10861,7 @@ else
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<EOF
-#line 10860 "configure"
-+#line 10858 "configure"
++#line 10864 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
-@@ -10957,7 +10955,7 @@
+@@ -10957,7 +10961,7 @@ else
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<EOF
-#line 10960 "configure"
-+#line 10958 "configure"
++#line 10964 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
-@@ -13358,11 +13356,11 @@
+@@ -13358,11 +13362,11 @@ else
-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:13361: $lt_compile\"" >&5)
-+ (eval echo "\"\$as_me:13359: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:13365: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:13365: \$? = $ac_status" >&5
-+ echo "$as_me:13363: \$? = $ac_status" >&5
++ echo "$as_me:13369: \$? = $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.
-@@ -13462,11 +13460,11 @@
+@@ -13462,11 +13466,11 @@ else
-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:13465: $lt_compile\"" >&5)
-+ (eval echo "\"\$as_me:13463: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:13469: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
- echo "$as_me:13469: \$? = $ac_status" >&5
-+ echo "$as_me:13467: \$? = $ac_status" >&5
++ echo "$as_me:13473: \$? = $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
-@@ -15060,11 +15058,11 @@
+@@ -15060,11 +15064,11 @@ else
-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:15063: $lt_compile\"" >&5)
-+ (eval echo "\"\$as_me:15061: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:15067: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:15067: \$? = $ac_status" >&5
-+ echo "$as_me:15065: \$? = $ac_status" >&5
++ echo "$as_me:15071: \$? = $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.
-@@ -15164,11 +15162,11 @@
+@@ -15164,11 +15168,11 @@ else
-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:15167: $lt_compile\"" >&5)
-+ (eval echo "\"\$as_me:15165: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:15171: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
- echo "$as_me:15171: \$? = $ac_status" >&5
-+ echo "$as_me:15169: \$? = $ac_status" >&5
++ echo "$as_me:15175: \$? = $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
-@@ -17384,11 +17382,11 @@
+@@ -17384,11 +17388,11 @@ else
-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:17387: $lt_compile\"" >&5)
-+ (eval echo "\"\$as_me:17385: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:17391: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:17391: \$? = $ac_status" >&5
-+ echo "$as_me:17389: \$? = $ac_status" >&5
++ echo "$as_me:17395: \$? = $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.
-@@ -17674,11 +17672,11 @@
+@@ -17674,11 +17678,11 @@ else
-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:17677: $lt_compile\"" >&5)
-+ (eval echo "\"\$as_me:17675: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:17681: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:17681: \$? = $ac_status" >&5
-+ echo "$as_me:17679: \$? = $ac_status" >&5
++ echo "$as_me:17685: \$? = $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.
-@@ -17778,11 +17776,11 @@
+@@ -17778,11 +17782,11 @@ else
-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:17781: $lt_compile\"" >&5)
-+ (eval echo "\"\$as_me:17779: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:17785: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
- echo "$as_me:17785: \$? = $ac_status" >&5
-+ echo "$as_me:17783: \$? = $ac_status" >&5
++ echo "$as_me:17789: \$? = $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
-@@ -93534,91 +93532,11 @@
+@@ -23277,12 +23281,15 @@ fi
+ gecko_cv_gecko=$with_gecko
+
+ # Autodetect gecko
+-_geckos="firefox mozilla-firefox seamonkey mozilla xulrunner"
++_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
+@@ -23294,14 +23301,26 @@ if test "x$gecko_cv_gecko" = "x"; then
+ with_epiphany_plugin=no
+ gecko_cv_have_gecko=no
+ elif ! ( echo "$_geckos" | egrep "(^| )$gecko_cv_gecko(\$| )" > /dev/null); then
+- { { echo "$as_me:$LINENO: error: Unknown gecko \"gecko_cv_gecko\" specified" >&5
+-echo "$as_me: error: Unknown gecko \"gecko_cv_gecko\" specified" >&2;}
++ { { 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
+ with_epiphany_plugin=yes
+ 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
+ # ****************
+@@ -23313,12 +23332,24 @@ mozilla) gecko_cv_gecko_flavour=mozilla
+ seamonkey) gecko_cv_gecko_flavour=mozilla ;;
+ *firefox) gecko_cv_gecko_flavour=toolkit ;;
+ xulrunner) gecko_cv_gecko_flavour=toolkit ;;
++libxul*) gecko_cv_gecko_flavour=toolkit ;;
+ esac
+
+-_GECKO_INCLUDE_ROOT="`$PKG_CONFIG --variable=includedir ${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
+@@ -23329,20 +23360,14 @@ _ACEOF
+
+ fi
+
+- if test "$gecko_cv_gecko_flavour" = "toolkit"; then
+- HAVE_MOZILLA_TOOLKIT_TRUE=
+- HAVE_MOZILLA_TOOLKIT_FALSE='#'
+-else
+- HAVE_MOZILLA_TOOLKIT_TRUE='#'
+- HAVE_MOZILLA_TOOLKIT_FALSE=
+-fi
+-
+-
+ MOZILLA=$gecko_cv_gecko
+ MOZILLA_FLAVOUR=$gecko_cv_gecko_flavour
+ MOZILLA_INCLUDE_ROOT=$_GECKO_INCLUDE_ROOT
++MOZILLA_CFLAGS=$_GECKO_CFLAGS
++MOZILLA_LIBDIR=$_GECKO_LIBDIR
+ MOZILLA_HOME=$_GECKO_HOME
+ MOZILLA_PREFIX=$_GECKO_PREFIX
++MOZILLA_NSPR=$_GECKO_NSPR
+
+ # **************************************************************
+ # This is really gcc-only
+@@ -23479,7 +23504,7 @@ 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; }
+@@ -23585,6 +23610,49 @@ rm -f core conftest.err conftest.$ac_obj
+ { 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
+@@ -23605,16 +23673,15 @@ _ACEOF
+
+ fi
+
+-fi # if gecko_cv_have_gecko
++if test "$gecko_cv_have_xpcom_glue" = "yes"; then
++
++cat >>confdefs.h <<\_ACEOF
++#define HAVE_GECKO_XPCOM_GLUE 1
++_ACEOF
+
+- 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
+
++fi # if gecko_cv_have_gecko
+
+ # ***********************
+ # Check for gecko version
+@@ -23630,7 +23697,7 @@ 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; }
+@@ -23779,7 +23846,54 @@ fi
+
+ fi # if gecko_cv_have_gecko
+
+- if test "$gecko_cv_gecko_version_int" -ge "1007000"; then
++MOZILLA_VERSION=$gecko_cv_gecko_version
++MOZILLA_VERSION_INT=$gecko_cv_gecko_version_int
++
++# **************************************************
++# 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
++ 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
++
++MOZILLA_EXTRA_PKG_DEPENDENCIES="$gecko_cv_extra_pkg_dependencies"
++MOZILLA_EXTRA_LIBS="$gecko_cv_extra_libs"
++MOZILLA_GLUE_LIBS="$gecko_cv_glue_libs"
++
++
++
++# Ensure we have an integer variable to compare with
++if test -z "$gecko_cv_gecko_version_int"; then
++ gecko_cv_gecko_version_int=0
++fi
++ if test "$gecko_cv_have_gecko" = "yes" -a "$gecko_cv_gecko_flavour" = "toolkit"; then
++ HAVE_MOZILLA_TOOLKIT_TRUE=
++ HAVE_MOZILLA_TOOLKIT_FALSE='#'
++else
++ HAVE_MOZILLA_TOOLKIT_TRUE='#'
++ HAVE_MOZILLA_TOOLKIT_FALSE=
++fi
++
++ if test "$gecko_cv_have_gecko" = "yes" -a "$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_gecko" = "yes" -a "$gecko_cv_gecko_version_int" -ge "1007000"; then
+ HAVE_GECKO_1_7_TRUE=
+ HAVE_GECKO_1_7_FALSE='#'
+ else
+@@ -23787,7 +23901,7 @@ else
+ HAVE_GECKO_1_7_FALSE=
+ fi
+
+- if test "$gecko_cv_gecko_version_int" -ge "1008000"; then
++ if test "$gecko_cv_have_gecko" = "yes" -a "$gecko_cv_gecko_version_int" -ge "1008000"; then
+ HAVE_GECKO_1_8_TRUE=
+ HAVE_GECKO_1_8_FALSE='#'
+ else
+@@ -23795,7 +23909,7 @@ else
+ HAVE_GECKO_1_8_FALSE=
+ fi
+
+- if test "$gecko_cv_gecko_version_int" -ge "1008001"; then
++ if test "$gecko_cv_have_gecko" = "yes" -a "$gecko_cv_gecko_version_int" -ge "1008001"; then
+ HAVE_GECKO_1_8_1_TRUE=
+ HAVE_GECKO_1_8_1_FALSE='#'
+ else
+@@ -23803,7 +23917,7 @@ else
+ HAVE_GECKO_1_8_1_FALSE=
+ fi
+
+- if test "$gecko_cv_gecko_version_int" -ge "1009000"; then
++ 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
+@@ -23811,25 +23925,29 @@ else
+ 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
+
+-MOZILLA_VERSION=$gecko_cv_gecko_version
+-MOZILLA_VERSION_INT=$gecko_cv_gecko_version_int
+-
+-# **************************************************
+-# Packages that we need to check for with pkg-config
+-# **************************************************
+-
+-gecko_cv_extra_libs=
+-gecko_cv_extra_pkg_dependencies=
+-
+-if test "$gecko_cv_gecko_version_int" -ge "1009000"; then
+- gecko_cv_extra_libs="-lxul"
++ if test "$gecko_cv_have_debug" = "yes"; then
++ HAVE_GECKO_DEBUG_TRUE=
++ HAVE_GECKO_DEBUG_FALSE='#'
+ else
+- gecko_cv_extra_pkg_dependencies="${gecko_cv_gecko}-gtkmozembed"
++ HAVE_GECKO_DEBUG_TRUE='#'
++ HAVE_GECKO_DEBUG_FALSE=
+ fi
+
+-MOZILLA_EXTRA_PKG_DEPENDENCIES="$gecko_cv_extra_pkg_dependencies"
+-MOZILLA_EXTRA_LIBS="$gecko_cv_extra_libs"
++ 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
+
+
+
+@@ -23841,7 +23959,7 @@ MOZILLA_EXTRA_LIBS="$gecko_cv_extra_libs
+
+
+ case "$MOZILLA" in
+- xulrunner) min_version=1.8 ;;
++ *xul*) min_version=1.8 ;;
+ *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;}
+@@ -84152,6 +84270,81 @@ fi
+ fi
+
+ if test "$with_epiphany_plugin" = "yes"; then
++ case "$gecko_cv_gecko" in
++ libxul*)
++
++pkg_failed=no
++{ echo "$as_me:$LINENO: checking for MOZILLA_COMPONENT" >&5
++echo $ECHO_N "checking for MOZILLA_COMPONENT... $ECHO_C" >&6; }
++
++if test -n "$PKG_CONFIG"; then
++ if test -n "$MOZILLA_COMPONENT_CFLAGS"; then
++ pkg_cv_MOZILLA_COMPONENT_CFLAGS="$MOZILLA_COMPONENT_CFLAGS"
++ else
++ if test -n "$PKG_CONFIG" && \
++ { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"\${gecko_cv_gecko} >= \$min_version \$gecko_cv_extra_pkg_dependencies\"") >&5
++ ($PKG_CONFIG --exists --print-errors "${gecko_cv_gecko} >= $min_version $gecko_cv_extra_pkg_dependencies") 2>&5
++ ac_status=$?
++ echo "$as_me:$LINENO: \$? = $ac_status" >&5
++ (exit $ac_status); }; then
++ pkg_cv_MOZILLA_COMPONENT_CFLAGS=`$PKG_CONFIG --cflags "${gecko_cv_gecko} >= $min_version $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 "$MOZILLA_COMPONENT_LIBS"; then
++ pkg_cv_MOZILLA_COMPONENT_LIBS="$MOZILLA_COMPONENT_LIBS"
++ else
++ if test -n "$PKG_CONFIG" && \
++ { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"\${gecko_cv_gecko} >= \$min_version \$gecko_cv_extra_pkg_dependencies\"") >&5
++ ($PKG_CONFIG --exists --print-errors "${gecko_cv_gecko} >= $min_version $gecko_cv_extra_pkg_dependencies") 2>&5
++ ac_status=$?
++ echo "$as_me:$LINENO: \$? = $ac_status" >&5
++ (exit $ac_status); }; then
++ pkg_cv_MOZILLA_COMPONENT_LIBS=`$PKG_CONFIG --libs "${gecko_cv_gecko} >= $min_version $gecko_cv_extra_pkg_dependencies" 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
++ MOZILLA_COMPONENT_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "${gecko_cv_gecko} >= $min_version $gecko_cv_extra_pkg_dependencies"`
++ else
++ MOZILLA_COMPONENT_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "${gecko_cv_gecko} >= $min_version $gecko_cv_extra_pkg_dependencies"`
++ fi
++ # Put the nasty error message in config.log where it belongs
++ echo "$MOZILLA_COMPONENT_PKG_ERRORS" >&5
++
++ { echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6; }
++ with_epiphany_plugin=no echo "disabling epiphany plugin"
++elif test $pkg_failed = untried; then
++ with_epiphany_plugin=no echo "disabling epiphany plugin"
++else
++ MOZILLA_COMPONENT_CFLAGS=$pkg_cv_MOZILLA_COMPONENT_CFLAGS
++ MOZILLA_COMPONENT_LIBS=$pkg_cv_MOZILLA_COMPONENT_LIBS
++ { echo "$as_me:$LINENO: result: yes" >&5
++echo "${ECHO_T}yes" >&6; }
++ with_epiphany_plugin=yes
++fi
++ ;;
++ *)
+
+ pkg_failed=no
+ { echo "$as_me:$LINENO: checking for MOZILLA_COMPONENT" >&5
+@@ -84223,6 +84416,8 @@ else
+ echo "${ECHO_T}yes" >&6; }
+ with_epiphany_plugin=yes
+ fi
++ ;;
++ esac
+ fi
+
+ if test "$with_epiphany_plugin" = "yes"; then
+@@ -93534,91 +93729,11 @@ if test "x$enable_ssh" = "xno"; then
echo "disabling ssh support"
else
@@ -249,9 +699,7 @@
-done
-done
-IFS=$as_save_IFS
-+# AC_PATH_PROG(SSH_KEYGEN_PATH, ssh-keygen, "failed")
-+# AC_PATH_PROG(SSH_PATH, ssh, "failed")
-
+-
- test -z "$ac_cv_path_SSH_KEYGEN_PATH" && ac_cv_path_SSH_KEYGEN_PATH=""failed""
- ;;
-esac
@@ -307,7 +755,9 @@
-fi
-
-
--
++# AC_PATH_PROG(SSH_KEYGEN_PATH, ssh-keygen, "failed")
++# AC_PATH_PROG(SSH_PATH, ssh, "failed")
+
- if test $SSH_KEYGEN_PATH != "failed" &&
- test $SSH_PATH != "failed"; then
+# if test $SSH_KEYGEN_PATH != "failed" && i
@@ -315,7 +765,7 @@
enable_ssh="yes"
cat >>confdefs.h <<\_ACEOF
-@@ -93627,15 +93545,15 @@
+@@ -93627,15 +93742,15 @@ _ACEOF
cat >>confdefs.h <<_ACEOF
@@ -334,7 +784,46 @@
fi
-@@ -96646,8 +96564,6 @@
+@@ -95712,6 +95827,27 @@ echo "$as_me: error: conditional \"HAVE_
+ 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 "${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 "${WITH_EPIPHANY_TRUE}" && test -z "${WITH_EPIPHANY_FALSE}"; then
+ { { echo "$as_me:$LINENO: error: conditional \"WITH_EPIPHANY\" was never defined.
+ Usually this means the macro was only invoked conditionally." >&5
+@@ -96619,6 +96755,10 @@ HAVE_GECKO_1_8_1_TRUE!$HAVE_GECKO_1_8_1_
+ 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
++HAVE_GECKO_XPCOM_GLUE_TRUE!$HAVE_GECKO_XPCOM_GLUE_TRUE$ac_delim
++HAVE_GECKO_XPCOM_GLUE_FALSE!$HAVE_GECKO_XPCOM_GLUE_FALSE$ac_delim
+ MOZILLA!$MOZILLA$ac_delim
+ MOZILLA_FLAVOUR!$MOZILLA_FLAVOUR$ac_delim
+ MOZILLA_HOME!$MOZILLA_HOME$ac_delim
+@@ -96646,8 +96786,6 @@ WITH_APPLET_TRUE!$WITH_APPLET_TRUE$ac_de
WITH_APPLET_FALSE!$WITH_APPLET_FALSE$ac_delim
LIBNOTIFY_CFLAGS!$LIBNOTIFY_CFLAGS$ac_delim
LIBNOTIFY_LIBS!$LIBNOTIFY_LIBS$ac_delim
@@ -343,19 +832,20 @@
WITH_SSH_TRUE!$WITH_SSH_TRUE$ac_delim
WITH_SSH_FALSE!$WITH_SSH_FALSE$ac_delim
LIBEBOOK_CFLAGS!$LIBEBOOK_CFLAGS$ac_delim
-@@ -96679,7 +96595,7 @@
+@@ -96679,7 +96817,7 @@ LIBOBJS!$LIBOBJS$ac_delim
LTLIBOBJS!$LTLIBOBJS$ac_delim
_ACEOF
- if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 67; then
-+ if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 65; then
++ if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 69; then
break
elif $ac_last_try; then
{ { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5
-diff -x'*config.sub' -x'*config.guess' -Naur seahorse-2.22.1.old/daemon/Makefile.in seahorse-2.22.1/daemon/Makefile.in
---- seahorse-2.22.1.old/daemon/Makefile.in 2008-04-07 03:59:30.000000000 +0200
-+++ seahorse-2.22.1/daemon/Makefile.in 2008-04-07 06:41:13.000000000 +0200
-@@ -63,7 +63,7 @@
+Index: seahorse-2.22.1/daemon/Makefile.in
+===================================================================
+--- seahorse-2.22.1.orig/daemon/Makefile.in 2008-05-12 16:35:12.520945493 +0200
++++ seahorse-2.22.1/daemon/Makefile.in 2008-05-12 16:36:31.776427492 +0200
+@@ -63,7 +63,7 @@ am_seahorse_daemon_OBJECTS = seahorse-da
seahorse_daemon_OBJECTS = $(am_seahorse_daemon_OBJECTS)
am__DEPENDENCIES_1 =
seahorse_daemon_DEPENDENCIES = \
@@ -364,16 +854,16 @@
$(top_builddir)/libcryptui/libcryptui.la $(am__DEPENDENCIES_1)
DEFAULT_INCLUDES = -I. at am__isrc@ -I$(top_builddir)
depcomp = $(SHELL) $(top_srcdir)/depcomp
-@@ -248,8 +248,6 @@
- SHELL = @SHELL@
- SOUP_CFLAGS = @SOUP_CFLAGS@
- SOUP_LIBS = @SOUP_LIBS@
--SSH_KEYGEN_PATH = @SSH_KEYGEN_PATH@
--SSH_PATH = @SSH_PATH@
- STRIP = @STRIP@
- USE_NLS = @USE_NLS@
- VERSION = @VERSION@
-@@ -332,7 +330,7 @@
+@@ -248,8 +248,6 @@ SHARING_LIBS = @SHARING_LIBS@
+ SHELL = @SHELL@
+ SOUP_CFLAGS = @SOUP_CFLAGS@
+ SOUP_LIBS = @SOUP_LIBS@
+-SSH_KEYGEN_PATH = @SSH_KEYGEN_PATH@
+-SSH_PATH = @SSH_PATH@
+ STRIP = @STRIP@
+ USE_NLS = @USE_NLS@
+ VERSION = @VERSION@
+@@ -332,7 +330,7 @@ seahorse_daemon_SOURCES = \
$(SHARING_SRCS)
seahorse_daemon_LDADD = \
@@ -382,34 +872,37 @@
$(top_builddir)/libcryptui/libcryptui.la \
$(SEAHORSE_LIBS)
-diff -x'*config.sub' -x'*config.guess' -Naur seahorse-2.22.1.old/data/Makefile.in seahorse-2.22.1/data/Makefile.in
---- seahorse-2.22.1.old/data/Makefile.in 2008-04-07 03:59:30.000000000 +0200
-+++ seahorse-2.22.1/data/Makefile.in 2008-04-07 06:41:13.000000000 +0200
-@@ -210,8 +210,6 @@
- SHELL = @SHELL@
- SOUP_CFLAGS = @SOUP_CFLAGS@
- SOUP_LIBS = @SOUP_LIBS@
--SSH_KEYGEN_PATH = @SSH_KEYGEN_PATH@
--SSH_PATH = @SSH_PATH@
- STRIP = @STRIP@
- USE_NLS = @USE_NLS@
- VERSION = @VERSION@
-diff -x'*config.sub' -x'*config.guess' -Naur seahorse-2.22.1.old/help/Makefile.in seahorse-2.22.1/help/Makefile.in
---- seahorse-2.22.1.old/help/Makefile.in 2008-04-07 03:59:34.000000000 +0200
-+++ seahorse-2.22.1/help/Makefile.in 2008-04-07 06:41:13.000000000 +0200
-@@ -225,8 +225,6 @@
- SHELL = @SHELL@
- SOUP_CFLAGS = @SOUP_CFLAGS@
- SOUP_LIBS = @SOUP_LIBS@
--SSH_KEYGEN_PATH = @SSH_KEYGEN_PATH@
--SSH_PATH = @SSH_PATH@
- STRIP = @STRIP@
- USE_NLS = @USE_NLS@
- VERSION = @VERSION@
-diff -x'*config.sub' -x'*config.guess' -Naur seahorse-2.22.1.old/intltool-extract.in seahorse-2.22.1/intltool-extract.in
---- seahorse-2.22.1.old/intltool-extract.in 2008-04-07 03:57:51.000000000 +0200
-+++ seahorse-2.22.1/intltool-extract.in 2008-04-07 06:40:46.000000000 +0200
-@@ -764,7 +764,7 @@
+Index: seahorse-2.22.1/data/Makefile.in
+===================================================================
+--- seahorse-2.22.1.orig/data/Makefile.in 2008-05-12 16:35:12.496944078 +0200
++++ seahorse-2.22.1/data/Makefile.in 2008-05-12 16:36:31.860427312 +0200
+@@ -210,8 +210,6 @@ SHARING_LIBS = @SHARING_LIBS@
+ SHELL = @SHELL@
+ SOUP_CFLAGS = @SOUP_CFLAGS@
+ SOUP_LIBS = @SOUP_LIBS@
+-SSH_KEYGEN_PATH = @SSH_KEYGEN_PATH@
+-SSH_PATH = @SSH_PATH@
+ STRIP = @STRIP@
+ USE_NLS = @USE_NLS@
+ VERSION = @VERSION@
+Index: seahorse-2.22.1/help/Makefile.in
+===================================================================
+--- seahorse-2.22.1.orig/help/Makefile.in 2008-05-12 16:35:12.468938434 +0200
++++ seahorse-2.22.1/help/Makefile.in 2008-05-12 16:36:31.992929146 +0200
+@@ -225,8 +225,6 @@ SHARING_LIBS = @SHARING_LIBS@
+ SHELL = @SHELL@
+ SOUP_CFLAGS = @SOUP_CFLAGS@
+ SOUP_LIBS = @SOUP_LIBS@
+-SSH_KEYGEN_PATH = @SSH_KEYGEN_PATH@
+-SSH_PATH = @SSH_PATH@
+ STRIP = @STRIP@
+ USE_NLS = @USE_NLS@
+ VERSION = @VERSION@
+Index: seahorse-2.22.1/intltool-extract.in
+===================================================================
+--- seahorse-2.22.1.orig/intltool-extract.in 2008-05-12 16:35:12.444936530 +0200
++++ seahorse-2.22.1/intltool-extract.in 2008-05-12 16:35:47.016933245 +0200
+@@ -764,7 +764,7 @@ sub type_glade {
}
## handle new glade files
@@ -418,34 +911,37 @@
$messages{entity_decode($3)} = [] unless $3 =~ /^(window|label)[0-9]+$/;
if (defined($2) and !($3 =~ /^(window|label)[0-9]+$/)) {
$comments{entity_decode($3)} = entity_decode($2) ;
-diff -x'*config.sub' -x'*config.guess' -Naur seahorse-2.22.1.old/libcryptui/Makefile.in seahorse-2.22.1/libcryptui/Makefile.in
---- seahorse-2.22.1.old/libcryptui/Makefile.in 2008-04-07 03:59:35.000000000 +0200
-+++ seahorse-2.22.1/libcryptui/Makefile.in 2008-04-07 06:41:13.000000000 +0200
-@@ -252,8 +252,6 @@
- SHELL = @SHELL@
- SOUP_CFLAGS = @SOUP_CFLAGS@
- SOUP_LIBS = @SOUP_LIBS@
--SSH_KEYGEN_PATH = @SSH_KEYGEN_PATH@
--SSH_PATH = @SSH_PATH@
- STRIP = @STRIP@
- USE_NLS = @USE_NLS@
- VERSION = @VERSION@
-diff -x'*config.sub' -x'*config.guess' -Naur seahorse-2.22.1.old/libcryptui/tests/Makefile.in seahorse-2.22.1/libcryptui/tests/Makefile.in
---- seahorse-2.22.1.old/libcryptui/tests/Makefile.in 2008-04-07 03:59:35.000000000 +0200
-+++ seahorse-2.22.1/libcryptui/tests/Makefile.in 2008-04-07 06:41:13.000000000 +0200
-@@ -229,8 +229,6 @@
- SHELL = @SHELL@
- SOUP_CFLAGS = @SOUP_CFLAGS@
- SOUP_LIBS = @SOUP_LIBS@
--SSH_KEYGEN_PATH = @SSH_KEYGEN_PATH@
--SSH_PATH = @SSH_PATH@
- STRIP = @STRIP@
- USE_NLS = @USE_NLS@
- VERSION = @VERSION@
-diff -x'*config.sub' -x'*config.guess' -Naur seahorse-2.22.1.old/libseahorse/Makefile.in seahorse-2.22.1/libseahorse/Makefile.in
---- seahorse-2.22.1.old/libseahorse/Makefile.in 2008-04-07 03:59:36.000000000 +0200
-+++ seahorse-2.22.1/libseahorse/Makefile.in 2008-04-07 06:41:14.000000000 +0200
-@@ -48,11 +48,20 @@
+Index: seahorse-2.22.1/libcryptui/Makefile.in
+===================================================================
+--- seahorse-2.22.1.orig/libcryptui/Makefile.in 2008-05-12 16:35:12.424929076 +0200
++++ seahorse-2.22.1/libcryptui/Makefile.in 2008-05-12 16:36:32.120930012 +0200
+@@ -252,8 +252,6 @@ SHARING_LIBS = @SHARING_LIBS@
+ SHELL = @SHELL@
+ SOUP_CFLAGS = @SOUP_CFLAGS@
+ SOUP_LIBS = @SOUP_LIBS@
+-SSH_KEYGEN_PATH = @SSH_KEYGEN_PATH@
+-SSH_PATH = @SSH_PATH@
+ STRIP = @STRIP@
+ USE_NLS = @USE_NLS@
+ VERSION = @VERSION@
+Index: seahorse-2.22.1/libcryptui/tests/Makefile.in
+===================================================================
+--- seahorse-2.22.1.orig/libcryptui/tests/Makefile.in 2008-05-12 16:35:12.372936685 +0200
++++ seahorse-2.22.1/libcryptui/tests/Makefile.in 2008-05-12 16:36:32.220929146 +0200
+@@ -229,8 +229,6 @@ SHARING_LIBS = @SHARING_LIBS@
+ SHELL = @SHELL@
+ SOUP_CFLAGS = @SOUP_CFLAGS@
+ SOUP_LIBS = @SOUP_LIBS@
+-SSH_KEYGEN_PATH = @SSH_KEYGEN_PATH@
+-SSH_PATH = @SSH_PATH@
+ STRIP = @STRIP@
+ USE_NLS = @USE_NLS@
+ VERSION = @VERSION@
+Index: seahorse-2.22.1/libseahorse/Makefile.in
+===================================================================
+--- seahorse-2.22.1.orig/libseahorse/Makefile.in 2008-05-12 16:35:12.352933142 +0200
++++ seahorse-2.22.1/libseahorse/Makefile.in 2008-05-12 16:36:32.436932105 +0200
+@@ -48,11 +48,20 @@ am__configure_deps = $(am__aclocal_m4_de
mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
CONFIG_HEADER = $(top_builddir)/config.h
CONFIG_CLEAN_FILES =
@@ -471,7 +967,7 @@
seahorse-key-source.c seahorse-key-source.h seahorse-pgp-key.c \
seahorse-pgp-key.h seahorse-pgp-key-op.c seahorse-pgp-key-op.h \
seahorse-pgp-source.c seahorse-pgp-source.h \
-@@ -89,49 +98,42 @@
+@@ -89,49 +98,42 @@ am__libseahorse_a_SOURCES_DIST = seahors
seahorse-ssh-key.c seahorse-ssh-key.h seahorse-ssh-source.c \
seahorse-ssh-source.h seahorse-ssh-operation.c \
seahorse-ssh-operation.h
@@ -553,7 +1049,7 @@
$(top_builddir)/libcryptui/libcryptui.la $(am__DEPENDENCIES_1)
am_xloadimage_OBJECTS = seahorse-xloadimage.$(OBJEXT)
xloadimage_OBJECTS = $(am_xloadimage_OBJECTS)
-@@ -148,16 +150,10 @@
+@@ -148,16 +150,10 @@ CCLD = $(CC)
LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
--mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \
$(LDFLAGS) -o $@
@@ -572,16 +1068,16 @@
gladeDATA_INSTALL = $(INSTALL_DATA)
DATA = $(glade_DATA)
ETAGS = etags
-@@ -317,8 +313,6 @@
- SHELL = @SHELL@
- SOUP_CFLAGS = @SOUP_CFLAGS@
- SOUP_LIBS = @SOUP_LIBS@
--SSH_KEYGEN_PATH = @SSH_KEYGEN_PATH@
--SSH_PATH = @SSH_PATH@
- STRIP = @STRIP@
- USE_NLS = @USE_NLS@
- VERSION = @VERSION@
-@@ -388,7 +382,7 @@
+@@ -317,8 +313,6 @@ SHARING_LIBS = @SHARING_LIBS@
+ SHELL = @SHELL@
+ SOUP_CFLAGS = @SOUP_CFLAGS@
+ SOUP_LIBS = @SOUP_LIBS@
+-SSH_KEYGEN_PATH = @SSH_KEYGEN_PATH@
+-SSH_PATH = @SSH_PATH@
+ STRIP = @STRIP@
+ USE_NLS = @USE_NLS@
+ VERSION = @VERSION@
+@@ -388,7 +382,7 @@ INCLUDES = -I$(top_builddir) \
-DEXECDIR=\""$(seahorselibexecbindir)"\" \
-DLIBCRYPTUI_API_SUBJECT_TO_CHANGE
@@ -590,7 +1086,7 @@
BUILT_SOURCES = \
seahorse-marshal.c seahorse-marshal.h
-@@ -409,7 +403,7 @@
+@@ -409,7 +403,7 @@ BUILT_SOURCES = \
@WITH_SSH_TRUE@ seahorse-ssh-key.h seahorse-ssh-source.c \
@WITH_SSH_TRUE@ seahorse-ssh-source.h seahorse-ssh-operation.c \
@WITH_SSH_TRUE@ seahorse-ssh-operation.h
@@ -599,7 +1095,7 @@
seahorse-key.c seahorse-key.h \
seahorse-key-source.c seahorse-key-source.h \
seahorse-pgp-key.c seahorse-pgp-key.h \
-@@ -452,10 +446,12 @@
+@@ -452,10 +446,12 @@ libseahorse_a_SOURCES = \
$(HKP_SRCS) \
$(SSH_SRCS)
@@ -613,7 +1109,7 @@
$(top_builddir)/libcryptui/libcryptui.la \
$(SEAHORSE_LIBS)
-@@ -504,13 +500,35 @@
+@@ -504,13 +500,35 @@ $(top_srcdir)/configure: @MAINTAINER_MOD
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -655,7 +1151,7 @@
install-seahorselibexecbinPROGRAMS: $(seahorselibexecbin_PROGRAMS)
@$(NORMAL_INSTALL)
test -z "$(seahorselibexecbindir)" || $(MKDIR_P) "$(DESTDIR)$(seahorselibexecbindir)"
-@@ -552,52 +570,52 @@
+@@ -552,52 +570,52 @@ mostlyclean-compile:
distclean-compile:
-rm -f *.tab.c
@@ -753,7 +1249,7 @@
@AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/seahorse-xloadimage.Po at am__quote@
.c.o:
-@@ -734,9 +752,9 @@
+@@ -734,9 +752,9 @@ distdir: $(DISTFILES)
check-am: all-am
check: $(BUILT_SOURCES)
$(MAKE) $(AM_MAKEFLAGS) check-am
@@ -765,7 +1261,7 @@
test -z "$$dir" || $(MKDIR_P) "$$dir"; \
done
install: $(BUILT_SOURCES)
-@@ -767,7 +785,7 @@
+@@ -767,7 +785,7 @@ maintainer-clean-generic:
-test -z "$(BUILT_SOURCES)" || rm -f $(BUILT_SOURCES)
clean: clean-am
@@ -774,7 +1270,7 @@
clean-seahorselibexecbinPROGRAMS mostlyclean-am
distclean: distclean-am
-@@ -790,7 +808,8 @@
+@@ -790,7 +808,8 @@ install-data-am: install-gladeDATA
install-dvi: install-dvi-am
@@ -784,7 +1280,7 @@
install-html: install-html-am
-@@ -822,24 +841,26 @@
+@@ -822,24 +841,26 @@ ps: ps-am
ps-am:
@@ -819,94 +1315,102 @@
uninstall-seahorselibexecbinPROGRAMS
-diff -x'*config.sub' -x'*config.guess' -Naur seahorse-2.22.1.old/ltmain.sh seahorse-2.22.1/ltmain.sh
---- seahorse-2.22.1.old/ltmain.sh 2008-02-08 01:54:46.000000000 +0100
-+++ seahorse-2.22.1/ltmain.sh 2008-04-05 19:05:47.000000000 +0200
-@@ -43,7 +43,7 @@
+Index: seahorse-2.22.1/ltmain.sh
+===================================================================
+--- seahorse-2.22.1.orig/ltmain.sh 2008-05-12 16:35:12.300938306 +0200
++++ seahorse-2.22.1/ltmain.sh 2008-04-29 22:21:21.000000000 +0200
+@@ -43,7 +43,7 @@ EXIT_FAILURE=1
PROGRAM=ltmain.sh
PACKAGE=libtool
-VERSION="1.5.26 Debian 1.5.26-1ubuntu1"
-+VERSION="1.5.26 Debian 1.5.26-3"
++VERSION="1.5.26 Debian 1.5.26-4"
TIMESTAMP=" (1.1220.2.493 2008/02/01 16:58:18)"
# Be Bourne compatible (taken from Autoconf:_AS_BOURNE_COMPATIBLE).
-diff -x'*config.sub' -x'*config.guess' -Naur seahorse-2.22.1.old/Makefile.in seahorse-2.22.1/Makefile.in
---- seahorse-2.22.1.old/Makefile.in 2008-04-07 03:59:44.000000000 +0200
-+++ seahorse-2.22.1/Makefile.in 2008-04-07 06:41:16.000000000 +0200
-@@ -233,8 +233,6 @@
- SHELL = @SHELL@
- SOUP_CFLAGS = @SOUP_CFLAGS@
- SOUP_LIBS = @SOUP_LIBS@
--SSH_KEYGEN_PATH = @SSH_KEYGEN_PATH@
--SSH_PATH = @SSH_PATH@
- STRIP = @STRIP@
- USE_NLS = @USE_NLS@
- VERSION = @VERSION@
-diff -x'*config.sub' -x'*config.guess' -Naur seahorse-2.22.1.old/pixmaps/22x22/Makefile.in seahorse-2.22.1/pixmaps/22x22/Makefile.in
---- seahorse-2.22.1.old/pixmaps/22x22/Makefile.in 2008-04-07 03:59:36.000000000 +0200
-+++ seahorse-2.22.1/pixmaps/22x22/Makefile.in 2008-04-07 06:41:14.000000000 +0200
-@@ -212,8 +212,6 @@
- SHELL = @SHELL@
- SOUP_CFLAGS = @SOUP_CFLAGS@
- SOUP_LIBS = @SOUP_LIBS@
--SSH_KEYGEN_PATH = @SSH_KEYGEN_PATH@
--SSH_PATH = @SSH_PATH@
- STRIP = @STRIP@
- USE_NLS = @USE_NLS@
- VERSION = @VERSION@
-diff -x'*config.sub' -x'*config.guess' -Naur seahorse-2.22.1.old/pixmaps/48x48/Makefile.in seahorse-2.22.1/pixmaps/48x48/Makefile.in
---- seahorse-2.22.1.old/pixmaps/48x48/Makefile.in 2008-04-07 03:59:37.000000000 +0200
-+++ seahorse-2.22.1/pixmaps/48x48/Makefile.in 2008-04-07 06:41:14.000000000 +0200
-@@ -213,8 +213,6 @@
- SHELL = @SHELL@
- SOUP_CFLAGS = @SOUP_CFLAGS@
- SOUP_LIBS = @SOUP_LIBS@
--SSH_KEYGEN_PATH = @SSH_KEYGEN_PATH@
--SSH_PATH = @SSH_PATH@
- STRIP = @STRIP@
- USE_NLS = @USE_NLS@
- VERSION = @VERSION@
-diff -x'*config.sub' -x'*config.guess' -Naur seahorse-2.22.1.old/pixmaps/Makefile.in seahorse-2.22.1/pixmaps/Makefile.in
---- seahorse-2.22.1.old/pixmaps/Makefile.in 2008-04-07 03:59:37.000000000 +0200
-+++ seahorse-2.22.1/pixmaps/Makefile.in 2008-04-07 06:41:14.000000000 +0200
-@@ -212,8 +212,6 @@
- SHELL = @SHELL@
- SOUP_CFLAGS = @SOUP_CFLAGS@
- SOUP_LIBS = @SOUP_LIBS@
--SSH_KEYGEN_PATH = @SSH_KEYGEN_PATH@
--SSH_PATH = @SSH_PATH@
- STRIP = @STRIP@
- USE_NLS = @USE_NLS@
- VERSION = @VERSION@
-diff -x'*config.sub' -x'*config.guess' -Naur seahorse-2.22.1.old/pixmaps/scalable/Makefile.in seahorse-2.22.1/pixmaps/scalable/Makefile.in
---- seahorse-2.22.1.old/pixmaps/scalable/Makefile.in 2008-04-07 03:59:37.000000000 +0200
-+++ seahorse-2.22.1/pixmaps/scalable/Makefile.in 2008-04-07 06:41:14.000000000 +0200
-@@ -213,8 +213,6 @@
- SHELL = @SHELL@
- SOUP_CFLAGS = @SOUP_CFLAGS@
- SOUP_LIBS = @SOUP_LIBS@
--SSH_KEYGEN_PATH = @SSH_KEYGEN_PATH@
--SSH_PATH = @SSH_PATH@
- STRIP = @STRIP@
- USE_NLS = @USE_NLS@
- VERSION = @VERSION@
-diff -x'*config.sub' -x'*config.guess' -Naur seahorse-2.22.1.old/plugins/applet/docs/Makefile.in seahorse-2.22.1/plugins/applet/docs/Makefile.in
---- seahorse-2.22.1.old/plugins/applet/docs/Makefile.in 2008-04-07 03:59:39.000000000 +0200
-+++ seahorse-2.22.1/plugins/applet/docs/Makefile.in 2008-04-07 06:41:15.000000000 +0200
-@@ -225,8 +225,6 @@
- SHELL = @SHELL@
- SOUP_CFLAGS = @SOUP_CFLAGS@
- SOUP_LIBS = @SOUP_LIBS@
--SSH_KEYGEN_PATH = @SSH_KEYGEN_PATH@
--SSH_PATH = @SSH_PATH@
- STRIP = @STRIP@
- USE_NLS = @USE_NLS@
- VERSION = @VERSION@
-diff -x'*config.sub' -x'*config.guess' -Naur seahorse-2.22.1.old/plugins/applet/Makefile.in seahorse-2.22.1/plugins/applet/Makefile.in
---- seahorse-2.22.1.old/plugins/applet/Makefile.in 2008-04-07 03:59:38.000000000 +0200
-+++ seahorse-2.22.1/plugins/applet/Makefile.in 2008-04-07 06:41:14.000000000 +0200
-@@ -55,7 +55,7 @@
+Index: seahorse-2.22.1/Makefile.in
+===================================================================
+--- seahorse-2.22.1.orig/Makefile.in 2008-05-12 16:35:12.276928579 +0200
++++ seahorse-2.22.1/Makefile.in 2008-05-12 16:36:33.964428501 +0200
+@@ -233,8 +233,6 @@ SHARING_LIBS = @SHARING_LIBS@
+ SHELL = @SHELL@
+ SOUP_CFLAGS = @SOUP_CFLAGS@
+ SOUP_LIBS = @SOUP_LIBS@
+-SSH_KEYGEN_PATH = @SSH_KEYGEN_PATH@
+-SSH_PATH = @SSH_PATH@
+ STRIP = @STRIP@
+ USE_NLS = @USE_NLS@
+ VERSION = @VERSION@
+Index: seahorse-2.22.1/pixmaps/22x22/Makefile.in
+===================================================================
+--- seahorse-2.22.1.orig/pixmaps/22x22/Makefile.in 2008-05-12 16:35:12.204934112 +0200
++++ seahorse-2.22.1/pixmaps/22x22/Makefile.in 2008-05-12 16:36:32.524927841 +0200
+@@ -212,8 +212,6 @@ SHARING_LIBS = @SHARING_LIBS@
+ SHELL = @SHELL@
+ SOUP_CFLAGS = @SOUP_CFLAGS@
+ SOUP_LIBS = @SOUP_LIBS@
+-SSH_KEYGEN_PATH = @SSH_KEYGEN_PATH@
+-SSH_PATH = @SSH_PATH@
+ STRIP = @STRIP@
+ USE_NLS = @USE_NLS@
+ VERSION = @VERSION@
+Index: seahorse-2.22.1/pixmaps/48x48/Makefile.in
+===================================================================
+--- seahorse-2.22.1.orig/pixmaps/48x48/Makefile.in 2008-05-12 16:35:12.108936762 +0200
++++ seahorse-2.22.1/pixmaps/48x48/Makefile.in 2008-05-12 16:36:32.624928931 +0200
+@@ -213,8 +213,6 @@ SHARING_LIBS = @SHARING_LIBS@
+ SHELL = @SHELL@
+ SOUP_CFLAGS = @SOUP_CFLAGS@
+ SOUP_LIBS = @SOUP_LIBS@
+-SSH_KEYGEN_PATH = @SSH_KEYGEN_PATH@
+-SSH_PATH = @SSH_PATH@
+ STRIP = @STRIP@
+ USE_NLS = @USE_NLS@
+ VERSION = @VERSION@
+Index: seahorse-2.22.1/pixmaps/Makefile.in
+===================================================================
+--- seahorse-2.22.1.orig/pixmaps/Makefile.in 2008-05-12 16:35:12.084937303 +0200
++++ seahorse-2.22.1/pixmaps/Makefile.in 2008-05-12 16:36:32.712929068 +0200
+@@ -212,8 +212,6 @@ SHARING_LIBS = @SHARING_LIBS@
+ SHELL = @SHELL@
+ SOUP_CFLAGS = @SOUP_CFLAGS@
+ SOUP_LIBS = @SOUP_LIBS@
+-SSH_KEYGEN_PATH = @SSH_KEYGEN_PATH@
+-SSH_PATH = @SSH_PATH@
+ STRIP = @STRIP@
+ USE_NLS = @USE_NLS@
+ VERSION = @VERSION@
+Index: seahorse-2.22.1/pixmaps/scalable/Makefile.in
+===================================================================
+--- seahorse-2.22.1.orig/pixmaps/scalable/Makefile.in 2008-05-12 16:35:11.996929832 +0200
++++ seahorse-2.22.1/pixmaps/scalable/Makefile.in 2008-05-12 16:36:32.804929033 +0200
+@@ -213,8 +213,6 @@ SHARING_LIBS = @SHARING_LIBS@
+ SHELL = @SHELL@
+ SOUP_CFLAGS = @SOUP_CFLAGS@
+ SOUP_LIBS = @SOUP_LIBS@
+-SSH_KEYGEN_PATH = @SSH_KEYGEN_PATH@
+-SSH_PATH = @SSH_PATH@
+ STRIP = @STRIP@
+ USE_NLS = @USE_NLS@
+ VERSION = @VERSION@
+Index: seahorse-2.22.1/plugins/applet/docs/Makefile.in
+===================================================================
+--- seahorse-2.22.1.orig/plugins/applet/docs/Makefile.in 2008-05-12 16:35:11.976930201 +0200
++++ seahorse-2.22.1/plugins/applet/docs/Makefile.in 2008-05-12 16:36:33.172428245 +0200
+@@ -225,8 +225,6 @@ SHARING_LIBS = @SHARING_LIBS@
+ SHELL = @SHELL@
+ SOUP_CFLAGS = @SOUP_CFLAGS@
+ SOUP_LIBS = @SOUP_LIBS@
+-SSH_KEYGEN_PATH = @SSH_KEYGEN_PATH@
+-SSH_PATH = @SSH_PATH@
+ STRIP = @STRIP@
+ USE_NLS = @USE_NLS@
+ VERSION = @VERSION@
+Index: seahorse-2.22.1/plugins/applet/Makefile.in
+===================================================================
+--- seahorse-2.22.1.orig/plugins/applet/Makefile.in 2008-05-12 16:35:11.948930424 +0200
++++ seahorse-2.22.1/plugins/applet/Makefile.in 2008-05-12 16:36:33.036430655 +0200
+@@ -55,7 +55,7 @@ am_seahorse_applet_OBJECTS = seahorse-ap
seahorse_applet_OBJECTS = $(am_seahorse_applet_OBJECTS)
am__DEPENDENCIES_1 =
seahorse_applet_DEPENDENCIES = $(am__DEPENDENCIES_1) \
@@ -915,16 +1419,16 @@
$(top_builddir)/libcryptui/libcryptui.la $(am__DEPENDENCIES_1) \
$(am__DEPENDENCIES_1)
DEFAULT_INCLUDES = -I. at am__isrc@ -I$(top_builddir)
-@@ -248,8 +248,6 @@
- SHELL = @SHELL@
- SOUP_CFLAGS = @SOUP_CFLAGS@
- SOUP_LIBS = @SOUP_LIBS@
--SSH_KEYGEN_PATH = @SSH_KEYGEN_PATH@
--SSH_PATH = @SSH_PATH@
- STRIP = @STRIP@
- USE_NLS = @USE_NLS@
- VERSION = @VERSION@
-@@ -333,7 +331,7 @@
+@@ -248,8 +248,6 @@ SHARING_LIBS = @SHARING_LIBS@
+ SHELL = @SHELL@
+ SOUP_CFLAGS = @SOUP_CFLAGS@
+ SOUP_LIBS = @SOUP_LIBS@
+-SSH_KEYGEN_PATH = @SSH_KEYGEN_PATH@
+-SSH_PATH = @SSH_PATH@
+ STRIP = @STRIP@
+ USE_NLS = @USE_NLS@
+ VERSION = @VERSION@
+@@ -333,7 +331,7 @@ seahorse_applet_SOURCES = \
seahorse_applet_LDADD = \
$(GNOME_APPLETS_LIBS) \
@@ -933,58 +1437,63 @@
$(top_builddir)/libcryptui/libcryptui.la \
$(SEAHORSE_LIBS) \
$(LIBCRYPTUI_LIBS)
-diff -x'*config.sub' -x'*config.guess' -Naur seahorse-2.22.1.old/plugins/epiphany/Makefile.in seahorse-2.22.1/plugins/epiphany/Makefile.in
---- seahorse-2.22.1.old/plugins/epiphany/Makefile.in 2008-04-07 03:59:40.000000000 +0200
-+++ seahorse-2.22.1/plugins/epiphany/Makefile.in 2008-04-07 06:41:15.000000000 +0200
-@@ -250,8 +250,6 @@
- SHELL = @SHELL@
- SOUP_CFLAGS = @SOUP_CFLAGS@
- SOUP_LIBS = @SOUP_LIBS@
--SSH_KEYGEN_PATH = @SSH_KEYGEN_PATH@
--SSH_PATH = @SSH_PATH@
- STRIP = @STRIP@
- USE_NLS = @USE_NLS@
- VERSION = @VERSION@
-diff -x'*config.sub' -x'*config.guess' -Naur seahorse-2.22.1.old/plugins/epiphany/mozilla/Makefile.in seahorse-2.22.1/plugins/epiphany/mozilla/Makefile.in
---- seahorse-2.22.1.old/plugins/epiphany/mozilla/Makefile.in 2008-04-07 03:59:40.000000000 +0200
-+++ seahorse-2.22.1/plugins/epiphany/mozilla/Makefile.in 2008-04-07 06:41:15.000000000 +0200
-@@ -232,8 +232,6 @@
- SHELL = @SHELL@
- SOUP_CFLAGS = @SOUP_CFLAGS@
- SOUP_LIBS = @SOUP_LIBS@
--SSH_KEYGEN_PATH = @SSH_KEYGEN_PATH@
--SSH_PATH = @SSH_PATH@
- STRIP = @STRIP@
- USE_NLS = @USE_NLS@
- VERSION = @VERSION@
-diff -x'*config.sub' -x'*config.guess' -Naur seahorse-2.22.1.old/plugins/gedit/Makefile.in seahorse-2.22.1/plugins/gedit/Makefile.in
---- seahorse-2.22.1.old/plugins/gedit/Makefile.in 2008-04-07 03:59:41.000000000 +0200
-+++ seahorse-2.22.1/plugins/gedit/Makefile.in 2008-04-07 06:41:15.000000000 +0200
-@@ -242,8 +242,6 @@
- SHELL = @SHELL@
- SOUP_CFLAGS = @SOUP_CFLAGS@
- SOUP_LIBS = @SOUP_LIBS@
--SSH_KEYGEN_PATH = @SSH_KEYGEN_PATH@
--SSH_PATH = @SSH_PATH@
- STRIP = @STRIP@
- USE_NLS = @USE_NLS@
- VERSION = @VERSION@
-diff -x'*config.sub' -x'*config.guess' -Naur seahorse-2.22.1.old/plugins/Makefile.in seahorse-2.22.1/plugins/Makefile.in
---- seahorse-2.22.1.old/plugins/Makefile.in 2008-04-07 03:59:38.000000000 +0200
-+++ seahorse-2.22.1/plugins/Makefile.in 2008-04-07 06:41:14.000000000 +0200
-@@ -212,8 +212,6 @@
- SHELL = @SHELL@
- SOUP_CFLAGS = @SOUP_CFLAGS@
- SOUP_LIBS = @SOUP_LIBS@
--SSH_KEYGEN_PATH = @SSH_KEYGEN_PATH@
--SSH_PATH = @SSH_PATH@
- STRIP = @STRIP@
- USE_NLS = @USE_NLS@
- VERSION = @VERSION@
-diff -x'*config.sub' -x'*config.guess' -Naur seahorse-2.22.1.old/plugins/nautilus/Makefile.in seahorse-2.22.1/plugins/nautilus/Makefile.in
---- seahorse-2.22.1.old/plugins/nautilus/Makefile.in 2008-04-07 03:59:43.000000000 +0200
-+++ seahorse-2.22.1/plugins/nautilus/Makefile.in 2008-04-07 06:41:15.000000000 +0200
-@@ -54,13 +54,13 @@
+Index: seahorse-2.22.1/plugins/epiphany/Makefile.in
+===================================================================
+--- seahorse-2.22.1.orig/plugins/epiphany/Makefile.in 2008-05-12 16:35:11.928931281 +0200
++++ seahorse-2.22.1/plugins/epiphany/Makefile.in 2008-05-12 16:36:33.292427499 +0200
+@@ -250,8 +250,6 @@ SHARING_LIBS = @SHARING_LIBS@
+ SHELL = @SHELL@
+ SOUP_CFLAGS = @SOUP_CFLAGS@
+ SOUP_LIBS = @SOUP_LIBS@
+-SSH_KEYGEN_PATH = @SSH_KEYGEN_PATH@
+-SSH_PATH = @SSH_PATH@
+ STRIP = @STRIP@
+ USE_NLS = @USE_NLS@
+ VERSION = @VERSION@
+Index: seahorse-2.22.1/plugins/epiphany/mozilla/Makefile.in
+===================================================================
+--- seahorse-2.22.1.orig/plugins/epiphany/mozilla/Makefile.in 2008-05-12 16:35:11.900938838 +0200
++++ seahorse-2.22.1/plugins/epiphany/mozilla/Makefile.in 2008-05-12 16:36:33.400434601 +0200
+@@ -232,8 +232,6 @@ SHARING_LIBS = @SHARING_LIBS@
+ SHELL = @SHELL@
+ SOUP_CFLAGS = @SOUP_CFLAGS@
+ SOUP_LIBS = @SOUP_LIBS@
+-SSH_KEYGEN_PATH = @SSH_KEYGEN_PATH@
+-SSH_PATH = @SSH_PATH@
+ STRIP = @STRIP@
+ USE_NLS = @USE_NLS@
+ VERSION = @VERSION@
+Index: seahorse-2.22.1/plugins/gedit/Makefile.in
+===================================================================
+--- seahorse-2.22.1.orig/plugins/gedit/Makefile.in 2008-05-12 16:35:11.876934489 +0200
++++ seahorse-2.22.1/plugins/gedit/Makefile.in 2008-05-12 16:36:33.516433537 +0200
+@@ -242,8 +242,6 @@ SHARING_LIBS = @SHARING_LIBS@
+ SHELL = @SHELL@
+ SOUP_CFLAGS = @SOUP_CFLAGS@
+ SOUP_LIBS = @SOUP_LIBS@
+-SSH_KEYGEN_PATH = @SSH_KEYGEN_PATH@
+-SSH_PATH = @SSH_PATH@
+ STRIP = @STRIP@
+ USE_NLS = @USE_NLS@
+ VERSION = @VERSION@
+Index: seahorse-2.22.1/plugins/Makefile.in
+===================================================================
+--- seahorse-2.22.1.orig/plugins/Makefile.in 2008-05-12 16:35:11.840935545 +0200
++++ seahorse-2.22.1/plugins/Makefile.in 2008-05-12 16:36:32.896929488 +0200
+@@ -212,8 +212,6 @@ SHARING_LIBS = @SHARING_LIBS@
+ SHELL = @SHELL@
+ SOUP_CFLAGS = @SOUP_CFLAGS@
+ SOUP_LIBS = @SOUP_LIBS@
+-SSH_KEYGEN_PATH = @SSH_KEYGEN_PATH@
+-SSH_PATH = @SSH_PATH@
+ STRIP = @STRIP@
+ USE_NLS = @USE_NLS@
+ VERSION = @VERSION@
+Index: seahorse-2.22.1/plugins/nautilus/Makefile.in
+===================================================================
+--- seahorse-2.22.1.orig/plugins/nautilus/Makefile.in 2008-05-12 16:35:11.820937869 +0200
++++ seahorse-2.22.1/plugins/nautilus/Makefile.in 2008-05-12 16:36:33.740427841 +0200
+@@ -54,13 +54,13 @@ am_seahorse_preferences_OBJECTS = seahor
seahorse_preferences_OBJECTS = $(am_seahorse_preferences_OBJECTS)
am__DEPENDENCIES_1 =
seahorse_preferences_DEPENDENCIES = \
@@ -1000,16 +1509,16 @@
$(top_builddir)/libcryptui/libcryptui.la $(am__DEPENDENCIES_1) \
$(am__DEPENDENCIES_1)
DEFAULT_INCLUDES = -I. at am__isrc@ -I$(top_builddir)
-@@ -247,8 +247,6 @@
- SHELL = @SHELL@
- SOUP_CFLAGS = @SOUP_CFLAGS@
- SOUP_LIBS = @SOUP_LIBS@
--SSH_KEYGEN_PATH = @SSH_KEYGEN_PATH@
--SSH_PATH = @SSH_PATH@
- STRIP = @STRIP@
- USE_NLS = @USE_NLS@
- VERSION = @VERSION@
-@@ -317,7 +315,7 @@
+@@ -247,8 +247,6 @@ SHARING_LIBS = @SHARING_LIBS@
+ SHELL = @SHELL@
+ SOUP_CFLAGS = @SOUP_CFLAGS@
+ SOUP_LIBS = @SOUP_LIBS@
+-SSH_KEYGEN_PATH = @SSH_KEYGEN_PATH@
+-SSH_PATH = @SSH_PATH@
+ STRIP = @STRIP@
+ USE_NLS = @USE_NLS@
+ VERSION = @VERSION@
+@@ -317,7 +315,7 @@ INCLUDES = -I$(top_builddir) \
seahorse_preferences_SOURCES = seahorse-pgp-preferences.c
seahorse_preferences_LDADD = \
@@ -1018,7 +1527,7 @@
$(top_builddir)/libcryptui/libcryptui.la \
$(SEAHORSE_LIBS)
-@@ -328,7 +326,7 @@
+@@ -328,7 +326,7 @@ seahorse_tool_SOURCES = \
seahorse-tool-progress.c
seahorse_tool_LDADD = \
@@ -1027,22 +1536,24 @@
$(top_builddir)/libcryptui/libcryptui.la \
$(SEAHORSE_LIBS) $(LIBCRYPTUI_LIBS)
-diff -x'*config.sub' -x'*config.guess' -Naur seahorse-2.22.1.old/plugins/nautilus-ext/Makefile.in seahorse-2.22.1/plugins/nautilus-ext/Makefile.in
---- seahorse-2.22.1.old/plugins/nautilus-ext/Makefile.in 2008-04-07 03:59:42.000000000 +0200
-+++ seahorse-2.22.1/plugins/nautilus-ext/Makefile.in 2008-04-07 06:41:15.000000000 +0200
-@@ -233,8 +233,6 @@
- SHELL = @SHELL@
- SOUP_CFLAGS = @SOUP_CFLAGS@
- SOUP_LIBS = @SOUP_LIBS@
--SSH_KEYGEN_PATH = @SSH_KEYGEN_PATH@
--SSH_PATH = @SSH_PATH@
- STRIP = @STRIP@
- USE_NLS = @USE_NLS@
- VERSION = @VERSION@
-diff -x'*config.sub' -x'*config.guess' -Naur seahorse-2.22.1.old/src/Makefile.in seahorse-2.22.1/src/Makefile.in
---- seahorse-2.22.1.old/src/Makefile.in 2008-04-07 03:59:44.000000000 +0200
-+++ seahorse-2.22.1/src/Makefile.in 2008-04-07 06:41:16.000000000 +0200
-@@ -97,7 +97,7 @@
+Index: seahorse-2.22.1/plugins/nautilus-ext/Makefile.in
+===================================================================
+--- seahorse-2.22.1.orig/plugins/nautilus-ext/Makefile.in 2008-05-12 16:35:11.796935965 +0200
++++ seahorse-2.22.1/plugins/nautilus-ext/Makefile.in 2008-05-12 16:36:33.620427610 +0200
+@@ -233,8 +233,6 @@ SHARING_LIBS = @SHARING_LIBS@
+ SHELL = @SHELL@
+ SOUP_CFLAGS = @SOUP_CFLAGS@
+ SOUP_LIBS = @SOUP_LIBS@
+-SSH_KEYGEN_PATH = @SSH_KEYGEN_PATH@
+-SSH_PATH = @SSH_PATH@
+ STRIP = @STRIP@
+ USE_NLS = @USE_NLS@
+ VERSION = @VERSION@
+Index: seahorse-2.22.1/src/Makefile.in
+===================================================================
+--- seahorse-2.22.1.orig/src/Makefile.in 2008-05-12 16:35:11.768935210 +0200
++++ seahorse-2.22.1/src/Makefile.in 2008-05-12 16:36:33.864427412 +0200
+@@ -97,7 +97,7 @@ am_seahorse_OBJECTS = main.$(OBJEXT) sea
$(am__objects_1) $(am__objects_2) $(am__objects_3)
seahorse_OBJECTS = $(am_seahorse_OBJECTS)
am__DEPENDENCIES_1 =
@@ -1051,16 +1562,16 @@
$(top_builddir)/libcryptui/libcryptui.la $(am__DEPENDENCIES_1)
DEFAULT_INCLUDES = -I. at am__isrc@ -I$(top_builddir)
depcomp = $(SHELL) $(top_srcdir)/depcomp
-@@ -279,8 +279,6 @@
- SHELL = @SHELL@
- SOUP_CFLAGS = @SOUP_CFLAGS@
- SOUP_LIBS = @SOUP_LIBS@
--SSH_KEYGEN_PATH = @SSH_KEYGEN_PATH@
--SSH_PATH = @SSH_PATH@
- STRIP = @STRIP@
- USE_NLS = @USE_NLS@
- VERSION = @VERSION@
-@@ -383,7 +381,7 @@
+@@ -279,8 +279,6 @@ SHARING_LIBS = @SHARING_LIBS@
+ SHELL = @SHELL@
+ SOUP_CFLAGS = @SOUP_CFLAGS@
+ SOUP_LIBS = @SOUP_LIBS@
+-SSH_KEYGEN_PATH = @SSH_KEYGEN_PATH@
+-SSH_PATH = @SSH_PATH@
+ STRIP = @STRIP@
+ USE_NLS = @USE_NLS@
+ VERSION = @VERSION@
+@@ -383,7 +381,7 @@ seahorse_SOURCES = main.c \
$(SSH_SRCS)
seahorse_LDADD = \
Modified: desktop/experimental/seahorse/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/seahorse/debian/patches/series?rev=15911&op=diff
==============================================================================
--- desktop/experimental/seahorse/debian/patches/series (original)
+++ desktop/experimental/seahorse/debian/patches/series Mon May 12 16:12:12 2008
@@ -4,5 +4,7 @@
05_focus_windows.patch
06_tray_hide_window.patch
08_force_ssh.patch
-10_relibtoolize.patch
+09_gecko_1.9.patch
+10_ephyembed_api.patch
15_fix_find-remote-keys.patch
+70_relibtoolize.patch
More information about the pkg-gnome-commits
mailing list