diff options
| author |   Samuli Suominen <ssuominen@gentoo.org> | 2010-08-07 12:33:45 +0000 |
|---|---|---|
| committer | Samuli Suominen <ssuominen@gentoo.org> | 2010-08-07 12:33:45 +0000 |
| commit | 6d31ccab24c30c20a2b8de8b1ebd756517f2ed1d (patch) | |
| tree | 92ef57fbb3b522c5fed695a1fb0d9a9e769671a3 /xfce-extra/xfce4-mailwatch-plugin | |
| parent | Version bump. Drop older (2010-07 didnt work at all for me). (diff) | |
| download | gentoo-2-6d31ccab24c30c20a2b8de8b1ebd756517f2ed1d.tar.gz gentoo-2-6d31ccab24c30c20a2b8de8b1ebd756517f2ed1d.tar.bz2 gentoo-2-6d31ccab24c30c20a2b8de8b1ebd756517f2ed1d.zip | |
Fix LDFLAGS vs. LDADD mistake in Makefile.am and link to libxfcegui4 wrt #331501 by Diego E. Pettenò.
(Portage version: 2.2_rc67/cvs/Linux x86_64)
Diffstat (limited to 'xfce-extra/xfce4-mailwatch-plugin')
3 files changed, 48 insertions, 7 deletions
diff --git a/xfce-extra/xfce4-mailwatch-plugin/ChangeLog b/xfce-extra/xfce4-mailwatch-plugin/ChangeLog index c3107218a6a1..bf297e7d5a00 100644 --- a/xfce-extra/xfce4-mailwatch-plugin/ChangeLog +++ b/xfce-extra/xfce4-mailwatch-plugin/ChangeLog @@ -1,6 +1,12 @@ # ChangeLog for xfce-extra/xfce4-mailwatch-plugin -# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/xfce-extra/xfce4-mailwatch-plugin/ChangeLog,v 1.2 2009/10/08 17:36:19 darkside Exp $ +# 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 $ + + 07 Aug 2010; Samuli Suominen <ssuominen@gentoo.org> + xfce4-mailwatch-plugin-1.1.0.ebuild, + +files/xfce4-mailwatch-plugin-1.1.0-link_to_libxfcegui4.patch: + Fix LDFLAGS vs. LDADD mistake in Makefile.am and link to libxfcegui4 wrt + #331501 by Diego E. Pettenò. 08 Oct 2009; Jeremy Olexa <darkside@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_libxfcegui4.patch b/xfce-extra/xfce4-mailwatch-plugin/files/xfce4-mailwatch-plugin-1.1.0-link_to_libxfcegui4.patch new file mode 100644 index 000000000000..1df738ce220a --- /dev/null +++ b/xfce-extra/xfce4-mailwatch-plugin/files/xfce4-mailwatch-plugin-1.1.0-link_to_libxfcegui4.patch @@ -0,0 +1,31 @@ +http://bugzilla.xfce.org/show_bug.cgi?id=6608 +http://bugs.gentoo.org/331501 + +--- panel-plugin/Makefile.am ++++ panel-plugin/Makefile.am +@@ -49,6 +49,7 @@ + xfce4_mailwatch_plugin_CFLAGS = \ + -I$(top_srcdir)/libmailwatch-core \ + @GTHREAD_CFLAGS@ \ ++ @LIBXFCEGUI4_CFLAGS@ \ + @LIBXFCE4PANEL_CFLAGS@ \ + -DDATADIR=\"$(datadir)\" \ + -DLOCALEDIR=\"$(localedir)\" +@@ -56,14 +57,15 @@ + xfce4_mailwatch_plugin_DEPENDENCIES = \ + $(top_builddir)/libmailwatch-core/libmailwatch-core.la + +-xfce4_mailwatch_plugin_LDFLAGS = \ ++xfce4_mailwatch_plugin_LDADD = \ + $(top_builddir)/libmailwatch-core/libmailwatch-core.la \ + @GTHREAD_LIBS@ \ ++ @LIBXFCEGUI4_LIBS@ \ + @LIBXFCE4PANEL_LIBS@ \ + @GNUTLS_LIBS@ + + if HAVE_CYGWIN +- xfce4_mailwatch_plugin_LDFLAGS += \ ++ xfce4_mailwatch_plugin_LDFLAGS = \ + -no-undefined + 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 f4debee752a7..43ae78fb794f 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,8 +1,9 @@ -# Copyright 1999-2009 Gentoo Foundation +# Copyright 1999-2010 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.2 2009/10/08 17:36:19 darkside Exp $ +# $Header: /var/cvsroot/gentoo-x86/xfce-extra/xfce4-mailwatch-plugin/xfce4-mailwatch-plugin-1.1.0.ebuild,v 1.3 2010/08/07 12:33:44 ssuominen Exp $ EAPI=2 +EAUTORECONF=yes inherit xfconf DESCRIPTION="Mail notification panel plugin" @@ -23,10 +24,13 @@ DEPEND="${RDEPEND} dev-util/pkgconfig" pkg_setup() { - DOCS="AUTHORS ChangeLog NEWS README TODO" + PATCHES=( + "${FILESDIR}"/${P}-no-ssl.patch + "${FILESDIR}"/${P}-link_to_libxfcegui4.patch + ) XFCONF="--disable-dependency-tracking $(use_enable ssl) $(use_enable ipv6) - $(use_enable debug)" - PATCHES=( "${FILESDIR}/${P}-no-ssl.patch" ) + $(xfconf_use_debug)" + DOCS="AUTHORS ChangeLog NEWS README TODO" } |