diff options
| author |   Christoph Mende <angelos@gentoo.org> | 2011-05-31 11:08:37 +0000 |
|---|---|---|
| committer | Christoph Mende <angelos@gentoo.org> | 2011-05-31 11:08:37 +0000 |
| commit | b16113dc934e458d75f7545177f9678fec0956e2 (patch) | |
| tree | 7b0321b860a5f248a9dacb658eef6a55d9556fc3 /xfce-extra | |
| parent | Version bump to latest. Drop older. (diff) | |
| download | gentoo-2-b16113dc934e458d75f7545177f9678fec0956e2.tar.gz gentoo-2-b16113dc934e458d75f7545177f9678fec0956e2.tar.bz2 gentoo-2-b16113dc934e458d75f7545177f9678fec0956e2.zip | |
Fix underlinking (bug #369457)
(Portage version: 2.2.0_alpha37/cvs/Linux x86_64)
Diffstat (limited to 'xfce-extra')
3 files changed, 46 insertions, 3 deletions
diff --git a/xfce-extra/xfce4-mailwatch-plugin/ChangeLog b/xfce-extra/xfce4-mailwatch-plugin/ChangeLog index bf297e7d5a00..0e9964c39b38 100644 --- a/xfce-extra/xfce4-mailwatch-plugin/ChangeLog +++ b/xfce-extra/xfce4-mailwatch-plugin/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for xfce-extra/xfce4-mailwatch-plugin -# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/xfce-extra/xfce4-mailwatch-plugin/ChangeLog,v 1.3 2010/08/07 12:33:44 ssuominen Exp $ +# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/xfce-extra/xfce4-mailwatch-plugin/ChangeLog,v 1.4 2011/05/31 11:08:37 angelos Exp $ + + 31 May 2011; Christoph Mende <angelos@gentoo.org> + xfce4-mailwatch-plugin-1.1.0.ebuild, + +files/xfce4-mailwatch-plugin-1.1.0-link_to_libgcrypt.patch: + Fix underlinking (bug #369457) 07 Aug 2010; Samuli Suominen <ssuominen@gentoo.org> xfce4-mailwatch-plugin-1.1.0.ebuild, diff --git a/xfce-extra/xfce4-mailwatch-plugin/files/xfce4-mailwatch-plugin-1.1.0-link_to_libgcrypt.patch b/xfce-extra/xfce4-mailwatch-plugin/files/xfce4-mailwatch-plugin-1.1.0-link_to_libgcrypt.patch new file mode 100644 index 000000000000..4e9d5e8a0730 --- /dev/null +++ b/xfce-extra/xfce4-mailwatch-plugin/files/xfce4-mailwatch-plugin-1.1.0-link_to_libgcrypt.patch @@ -0,0 +1,37 @@ +diff --git a/configure.ac b/configure.ac +index df02271..e17375f 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -82,6 +82,7 @@ XDT_CHECK_OPTIONAL_PACKAGE([GNUTLS], [gnutls], [1.2.0], [ssl], + [gnutls support for secure IMAP/POP3 connections], [yes]) + if test "x$GNUTLS_FOUND" = "xyes"; then + AC_DEFINE([HAVE_SSL_SUPPORT], [1], [Define if SSL support is enabled]) ++ AM_PATH_LIBGCRYPT() + fi + AM_CONDITIONAL([HAVE_SSL_SUPPORT], [test "x$GNUTLS_FOUND" = "xyes"]) + +diff --git a/libmailwatch-core/Makefile.am b/libmailwatch-core/Makefile.am +index 181992e..03a8675 100644 +--- a/libmailwatch-core/Makefile.am ++++ b/libmailwatch-core/Makefile.am +@@ -20,10 +20,6 @@ libmailwatch_core_la_SOURCES = \ + mailwatch.c \ + mailwatch.h + +-if HAVE_SSL_SUPPORT +-libmailwatch_core_la_SOURCES += mailwatch-mailbox-gmail.c +-endif +- + libmailwatch_core_la_CFLAGS = \ + @GTHREAD_CFLAGS@ \ + @GTK_CFLAGS@ \ +@@ -31,3 +27,9 @@ libmailwatch_core_la_CFLAGS = \ + @GNUTLS_CFLAGS@ \ + -DDATADIR=\"$(datadir)\" \ + -DLOCALEDIR=\"$(localedir)\" ++ ++if HAVE_SSL_SUPPORT ++libmailwatch_core_la_SOURCES += mailwatch-mailbox-gmail.c ++libmailwatch_core_la_CFLAGS += @LIBGCRYPT_CFLAGS@ ++libmailwatch_core_la_LIBADD = @LIBGCRYPT_LIBS@ ++endif diff --git a/xfce-extra/xfce4-mailwatch-plugin/xfce4-mailwatch-plugin-1.1.0.ebuild b/xfce-extra/xfce4-mailwatch-plugin/xfce4-mailwatch-plugin-1.1.0.ebuild index 540b9435cdca..76356842ec0c 100644 --- a/xfce-extra/xfce4-mailwatch-plugin/xfce4-mailwatch-plugin-1.1.0.ebuild +++ b/xfce-extra/xfce4-mailwatch-plugin/xfce4-mailwatch-plugin-1.1.0.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2011 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/xfce-extra/xfce4-mailwatch-plugin/xfce4-mailwatch-plugin-1.1.0.ebuild,v 1.5 2011/05/19 21:42:34 ssuominen Exp $ +# $Header: /var/cvsroot/gentoo-x86/xfce-extra/xfce4-mailwatch-plugin/xfce4-mailwatch-plugin-1.1.0.ebuild,v 1.6 2011/05/31 11:08:37 angelos Exp $ EAPI=4 EAUTORECONF=yes @@ -27,6 +27,7 @@ pkg_setup() { PATCHES=( "${FILESDIR}"/${P}-no-ssl.patch "${FILESDIR}"/${P}-link_to_libxfcegui4.patch + "${FILESDIR}"/${P}-link_to_libgcrypt.patch ) XFCONF=( |