diff options
| author |   Alon Bar-Lev <alonbl@gentoo.org> | 2007-12-04 11:09:38 +0000 |
|---|---|---|
| committer | Alon Bar-Lev <alonbl@gentoo.org> | 2007-12-04 11:09:38 +0000 |
| commit | 76ac7203240f8c67d0f8012a23ccb46caa98fb3d (patch) | |
| tree | 0e1368dde616c3a3962bdf8e9336779b0e1b75d1 /sys-fs/ecryptfs-utils | |
| parent | x86 stable (diff) | |
| download | gentoo-2-76ac7203240f8c67d0f8012a23ccb46caa98fb3d.tar.gz gentoo-2-76ac7203240f8c67d0f8012a23ccb46caa98fb3d.tar.bz2 gentoo-2-76ac7203240f8c67d0f8012a23ccb46caa98fb3d.zip | |
Fix gtk issue, bug#199778
(Portage version: 2.1.4_rc5)
Diffstat (limited to 'sys-fs/ecryptfs-utils')
| -rw-r--r-- | sys-fs/ecryptfs-utils/ChangeLog | 6 | ||||
| -rw-r--r-- | sys-fs/ecryptfs-utils/ecryptfs-utils-30.ebuild | 3 | ||||
| -rw-r--r-- | sys-fs/ecryptfs-utils/files/ecryptfs-utils-30-gtk.patch | 22 |
3 files changed, 29 insertions, 2 deletions
diff --git a/sys-fs/ecryptfs-utils/ChangeLog b/sys-fs/ecryptfs-utils/ChangeLog index 3c83ba213cbe..8fb212f8e206 100644 --- a/sys-fs/ecryptfs-utils/ChangeLog +++ b/sys-fs/ecryptfs-utils/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for sys-fs/ecryptfs-utils # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sys-fs/ecryptfs-utils/ChangeLog,v 1.11 2007/11/20 18:17:32 alonbl Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-fs/ecryptfs-utils/ChangeLog,v 1.12 2007/12/04 11:09:37 alonbl Exp $ + + 04 Dec 2007; Alon Bar-Lev <alonbl@gentoo.org> + +files/ecryptfs-utils-30-gtk.patch, ecryptfs-utils-30.ebuild: + Fix gtk issue, bug#199778 20 Nov 2007; Alon Bar-Lev <alonbl@gentoo.org> +files/ecryptfs-utils-30-gpgme.patch, ecryptfs-utils-30.ebuild: diff --git a/sys-fs/ecryptfs-utils/ecryptfs-utils-30.ebuild b/sys-fs/ecryptfs-utils/ecryptfs-utils-30.ebuild index 224614bf8859..2d0379bb666f 100644 --- a/sys-fs/ecryptfs-utils/ecryptfs-utils-30.ebuild +++ b/sys-fs/ecryptfs-utils/ecryptfs-utils-30.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2007 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-fs/ecryptfs-utils/ecryptfs-utils-30.ebuild,v 1.3 2007/11/20 18:17:32 alonbl Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-fs/ecryptfs-utils/ecryptfs-utils-30.ebuild,v 1.4 2007/12/04 11:09:37 alonbl Exp $ inherit autotools @@ -32,6 +32,7 @@ src_unpack() { unpack ${A} cd "${S}" epatch "${FILESDIR}/${P}-gpgme.patch" + epatch "${FILESDIR}/${P}-gtk.patch" # Until upstream move to autoconf-2.60 eautoreconf } diff --git a/sys-fs/ecryptfs-utils/files/ecryptfs-utils-30-gtk.patch b/sys-fs/ecryptfs-utils/files/ecryptfs-utils-30-gtk.patch new file mode 100644 index 000000000000..52162e518947 --- /dev/null +++ b/sys-fs/ecryptfs-utils/files/ecryptfs-utils-30-gtk.patch @@ -0,0 +1,22 @@ +diff --git a/configure.ac b/configure.ac +index 6778105..2cef444 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -265,7 +265,16 @@ if test "${enable_pam}" = "yes" ; then + fi + + if test "${enable_gui}" = "yes"; then +- PKG_CHECK_MODULES([GTK], [gtk+ >= 1.0],, AC_MSG_ERROR([Cannot locate gtk+])) ++ PKG_CHECK_MODULES( ++ [GTK], ++ [gtk+-2.0 >= 2.0], ++ , ++ PKG_CHECK_MODULES( ++ [GTK], ++ [gtk+ >= 1.0],, ++ AC_MSG_ERROR([Cannot locate gtk+]) ++ ) ++ ) + fi + + pkgconfigdir="\$(libdir)/pkgconfig" |