diff options
author | Pacho Ramos <pacho@gentoo.org> | 2010-04-17 12:16:14 +0000 |
---|---|---|
committer | Pacho Ramos <pacho@gentoo.org> | 2010-04-17 12:16:14 +0000 |
commit | 3d736c4c89a13be683f0fede0010bde8b2730b14 (patch) | |
tree | 50320496edfcb91a6f9f6cb168f750c496a51a1d /gnome-base/gnome-vfs | |
parent | Initial commit wrt #307113 by "keenblade". (diff) | |
download | gentoo-2-3d736c4c89a13be683f0fede0010bde8b2730b14.tar.gz gentoo-2-3d736c4c89a13be683f0fede0010bde8b2730b14.tar.bz2 gentoo-2-3d736c4c89a13be683f0fede0010bde8b2730b14.zip |
Fix bug 312909
(Portage version: 2.1.8.3/cvs/Linux x86_64)
Diffstat (limited to 'gnome-base/gnome-vfs')
-rw-r--r-- | gnome-base/gnome-vfs/ChangeLog | 8 | ||||
-rw-r--r-- | gnome-base/gnome-vfs/files/gnome-vfs-2.24.0-gnutls27.patch | 2 |
2 files changed, 8 insertions, 2 deletions
diff --git a/gnome-base/gnome-vfs/ChangeLog b/gnome-base/gnome-vfs/ChangeLog index 0e6561fc4c18..784a3d4fe13d 100644 --- a/gnome-base/gnome-vfs/ChangeLog +++ b/gnome-base/gnome-vfs/ChangeLog @@ -1,6 +1,12 @@ # ChangeLog for gnome-base/gnome-vfs # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-vfs/ChangeLog,v 1.322 2010/04/14 19:27:55 pacho Exp $ +# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-vfs/ChangeLog,v 1.323 2010/04/17 12:16:14 pacho Exp $ + + 17 Apr 2010; Pacho Ramos <pacho@gentoo.org> + files/gnome-vfs-2.24.0-gnutls27.patch: + Fix gnutls patch to stop getting have_ssl: command not found when building + with gnutls USE flag, see bug #312909. Thanks to Rafal for the fix and + Martin for reporting. 14 Apr 2010; Pacho Ramos <pacho@gentoo.org> gnome-vfs-2.24.3.ebuild: Raise gtk-doc-am dependency solving bug #313645 diff --git a/gnome-base/gnome-vfs/files/gnome-vfs-2.24.0-gnutls27.patch b/gnome-base/gnome-vfs/files/gnome-vfs-2.24.0-gnutls27.patch index 15483c681f3d..f6fa18b1790d 100644 --- a/gnome-base/gnome-vfs/files/gnome-vfs-2.24.0-gnutls27.patch +++ b/gnome-base/gnome-vfs/files/gnome-vfs-2.24.0-gnutls27.patch @@ -9,7 +9,7 @@ - AM_PATH_LIBGNUTLS(1.0.0, [AC_DEFINE(HAVE_GNUTLS, 1, [Define to 1 if GnuTLS is available]) - have_ssl=true]) + PKG_CHECK_MODULES(LIBGNUTLS, gnutls >= 1.0.0, [AC_DEFINE(HAVE_GNUTLS, 1, [Define to 1 if GnuTLS is available]) -+ have_ssl = true]) ++ have_ssl=true]) if test "x${LIBGNUTLS_LIBS}" = "x"; then - AM_PATH_LIBGNUTLS(0.5.1, [AC_DEFINE(HAVE_GNUTLS, 1, [Define to 1 if GnuTLS is available]) |