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 | 94042680a16316e6ee7ac9e39732c39c6e71a0a2 (patch) | |
| tree | caaf6d7e7c70f6234a85c5a812f9b129bd5585f3 /gnome-base | |
| parent | Initial commit wrt #307113 by "keenblade". (diff) | |
| download | historical-94042680a16316e6ee7ac9e39732c39c6e71a0a2.tar.gz historical-94042680a16316e6ee7ac9e39732c39c6e71a0a2.tar.bz2 historical-94042680a16316e6ee7ac9e39732c39c6e71a0a2.zip | |
Fix bug 312909
Package-Manager: portage-2.1.8.3/cvs/Linux x86_64
Diffstat (limited to 'gnome-base')
| -rw-r--r-- | gnome-base/gnome-vfs/ChangeLog | 8 | ||||
| -rw-r--r-- | gnome-base/gnome-vfs/Manifest | 10 | ||||
| -rw-r--r-- | gnome-base/gnome-vfs/files/gnome-vfs-2.24.0-gnutls27.patch | 2 |
3 files changed, 13 insertions, 7 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/Manifest b/gnome-base/gnome-vfs/Manifest index aa2d948da888..23a36f9a89a7 100644 --- a/gnome-base/gnome-vfs/Manifest +++ b/gnome-base/gnome-vfs/Manifest @@ -7,7 +7,7 @@ AUX gnome-vfs-2.16.0-no-dbus-crash.patch 710 RMD160 816b75d144fc264a34e45f0e2d17 AUX gnome-vfs-2.20.0-automagic-deps.patch 2008 RMD160 91c4b7b771548b6645a1bf1764cff9af7947da43 SHA1 da27fcb4652a8f3a9e042a916371bbf03f03ad71 SHA256 478f55fe5e38714a22854351d46a031cacf1c003855865a8bdd1c2f1ececb5c5 AUX gnome-vfs-2.20.0-home_dir_fakeroot.patch 5197 RMD160 1d2b5909c8ea2c901597ed3784ae3d2524f1145e SHA1 1ff4d5fc865f92c2ae8616511fbfe2efdad080fd SHA256 61b2959ceaeae412cc96dac1258dec47182f6935c4a6145c756541e6e038fe95 AUX gnome-vfs-2.20.1-automagic-deps.patch 643 RMD160 0e984be0bf21114192174b87ed9cb9b91df38ff9 SHA1 75c330ed9dd352aae758c7691d766ba7df1a7885 SHA256 7d50fa5944125190ce0b0d47013bc4ff4fbfe2908520828dc9ced80d9b47ed02 -AUX gnome-vfs-2.24.0-gnutls27.patch 1334 RMD160 e3de6ae9314255fccdf2e67e05e80c6c25015726 SHA1 6735af4bbd14980354ff2b834b903eca52c16bca SHA256 321453556381b8c7c22fad1786cc09347716fed02e40756b974c59a184c272f4 +AUX gnome-vfs-2.24.0-gnutls27.patch 1332 RMD160 4524693921a3a7675d50da69dec6766dbd2b5861 SHA1 f7fefc9d6c9d39b02d421ee96c5707f00debb170 SHA256 66c7cfb12995c0dd94a2caea95c7e3c55981993f05a79c585d60915ff131955d AUX gnome-vfs-2.24.0-uuid-mount.patch 2162 RMD160 9c92a80b859d322faff6b1239d28dfaa2b5f0bbd SHA1 2a76d49e599681066cb161b3c42630c8e039d5a6 SHA256 40cdac82d48e68ec563da5d13e6116c42c2c18ac972287638e8ff63357e55823 AUX gnome-vfs-2.24.2-symlink-crash.patch 843 RMD160 81f1783462873dfc56026d9bcf6c75475b8846ca SHA1 81a1704f6e7a0c5c829bb6cc7fb2f2767f98e520 SHA256 a03d6118e6bbf2f9c8e292be3c1c3d78c7f6fa2421f2c284622e74e501c8c3bc DIST gnome-vfs-2.24.1.tar.bz2 1936704 RMD160 e4c6f99b67496a456596b7040aff859ca49a8998 SHA1 0e7b548ffe7b9eddaef3a43cdda47de538715f8b SHA256 bc59144e303b152b84b86f209347a3e87a91d5ed7172d8503ee19c232dcabeb6 @@ -17,12 +17,12 @@ EBUILD gnome-vfs-2.24.1.ebuild 3628 RMD160 aced1c861e92441aace80607b06d37bd958aa EBUILD gnome-vfs-2.24.2-r1.ebuild 3756 RMD160 aa8d69dd823513da436c4693ad087479b9958050 SHA1 b6df62f1d71bd0a0793d29e7c9c000d5feeb6b56 SHA256 fcd816939ef979d3f6d98ffc937d0abe1a2031b8e6de755ed7f4b72619e097f3 EBUILD gnome-vfs-2.24.2.ebuild 3633 RMD160 3a49755331ec75a7b0dc2dd6dad8a883e52c2f13 SHA1 00535f92104d07a73efeb7b4cd2b125d0c9bf97e SHA256 80c72469fea33acc59c883b4a8d914f1c965153688fbf67545e6bfe20fb2f42e EBUILD gnome-vfs-2.24.3.ebuild 3641 RMD160 5e19903eaa5ba6c3073f0e7d25186d847adb2af9 SHA1 434af8aebb8e3bc66e783eb3543f21c4349389d4 SHA256 10ff05fda384123e7459f0ba4da34a1298afbe0d49f0847be27cf9e679bace9a -MISC ChangeLog 42271 RMD160 24698ccab674a0f9fc82d29becf29e6d13c728b4 SHA1 40b7aefaba7dba64ffa8c96a0c7ff8b33ed6d0ef SHA256 fdbdab0892baae00d93671e723dbe706ce2a182ed99d20549447f9bff8c34f29 +MISC ChangeLog 42533 RMD160 45bdc9cb3413a2b2be2b27d4ad03e7164eea3607 SHA1 eac53079a04acae850e83efb220a197d2d6000c9 SHA256 30128123ced786cc5139b7b506bfb44ede365e35979bb9f17f0b00731456c653 MISC metadata.xml 158 RMD160 c0e2bae8e91bb6be8922bac5e4f597302e06587e SHA1 38f78e9790bcd4382b4a49aa226aa6dda1d3a3d7 SHA256 3a7dbca0fdc557de69783e0663e2d76ddab129ea8a19b2d0ef6d3e5d1b947ce1 -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.14 (GNU/Linux) -iEYEARECAAYFAkvGF0QACgkQCaWpQKGI+9TkBACfbnGohSKEyiDEba0ubXOaZ37r -howAnieSUgTsT/IxVp2Hy0uQVBN5Yijx -=ChFU +iEYEARECAAYFAkvJppcACgkQCaWpQKGI+9RDNQCeIJcgxSNXWV64BzNiqbbNswtW +BWcAnAhFYBiaN6+T7BvvQfFcypogToOT +=wvxl -----END PGP SIGNATURE----- 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]) |