[oe] [PATCH v2] epiphany-2.30.2: unbreak do_configure by setting ca-file path

[Steffen Sledz]

* Disable existence check for ca-bundle file in configure.ac because
  it does not work in OE cross compile environment (location at build
  host may differ from location at target).
* Explicitely set ca-bundle file path according to the one used by
  ca-certificates package.

Signed-off-by: Steffen Sledz <sledz at dresearch.de>
---
 recipes/gnome/epiphany/ca-file-configure.patch |   17 +++++++++++++++++
 recipes/gnome/epiphany_2.30.2.bb               |    6 ++++--
 2 files changed, 21 insertions(+), 2 deletions(-)
 create mode 100644 recipes/gnome/epiphany/ca-file-configure.patch

diff --git a/recipes/gnome/epiphany/ca-file-configure.patch b/recipes/gnome/epiphany/ca-file-configure.patch
new file mode 100644
index 0000000..b77d441
--- /dev/null
+++ b/recipes/gnome/epiphany/ca-file-configure.patch
@@ -0,0 +1,17 @@
+--- epiphany-2.30.2.orig/configure.ac	2010-10-25 11:10:31.316864572 +0200
++++ epiphany-2.30.2/configure.ac	2010-10-25 11:12:29.562614607 +0200
+@@ -272,9 +272,11 @@
+     fi
+ 
+     AC_MSG_RESULT($with_ca_file)
+-    if ! test -f "$with_ca_file"; then
+-        AC_MSG_ERROR([No such file '$with_ca_file'. Use --with-ca-file=path to set, or --without-ca-file to disable])
+-    fi
++# disable this check because it does not work in all environments
++# (location at build host may differ from target)
++#    if ! test -f "$with_ca_file"; then
++#        AC_MSG_ERROR([No such file '$with_ca_file'. Use --with-ca-file=path to set, or --without-ca-file to disable])
++#    fi
+     GTLS_SYSTEM_CA_FILE="$with_ca_file"
+ 
+     AC_DEFINE_UNQUOTED([GTLS_SYSTEM_CA_FILE], ["$GTLS_SYSTEM_CA_FILE"], [path to system Certificate Authority list])
diff --git a/recipes/gnome/epiphany_2.30.2.bb b/recipes/gnome/epiphany_2.30.2.bb
index 57a5d9a..5a0a5eb 100644
--- a/recipes/gnome/epiphany_2.30.2.bb
+++ b/recipes/gnome/epiphany_2.30.2.bb
@@ -3,15 +3,17 @@ LICENSE = "GPLv2+"
 DEPENDS = "libsoup-2.4 gnome-desktop gnome-vfs libgnomeui webkit-gtk iso-codes startup-notification ca-certificates"
 RDEPENDS_${PN} = "gnome-vfs-plugin-http iso-codes"
 RRECOMMENDS_${PN} = "ca-certificates"
-PR = "r4"
+PR = "r5"
 
 inherit gnome
 
+SRC_URI += " file://ca-file-configure.patch "
+
 SRC_URI[archive.md5sum] = "29b084acfa016540d91d3601ec3dff5c"
 SRC_URI[archive.sha256sum] = "cd0124e71e72142593cfeb442d58d97e99ba94ace6e31d94717fe977c0bfb98a"
 
 
-EXTRA_OECONF += "--disable-nss --with-engine=webkit --with-distributor-name=${DISTRO}"
+EXTRA_OECONF += "--disable-nss --with-engine=webkit --with-distributor-name=${DISTRO} --with-ca-file=/etc/ssl/certs/ca-certificates.crt"
 
 do_configure_prepend() {
         touch ${S}/gnome-doc-utils.make
-- 
1.7.1