diff options
| author |   Samuli Suominen <ssuominen@gentoo.org> | 2010-08-05 22:47:22 +0000 |
|---|---|---|
| committer | Samuli Suominen <ssuominen@gentoo.org> | 2010-08-05 22:47:22 +0000 |
| commit | 757aea4ea2232a403a8c6028d9fe83cb84639eac (patch) | |
| tree | 0592840c673e1cdc03ad4cef62560db59a0fe6f2 /xfce-extra/xfce4-wavelan-plugin | |
| parent | Remove xmlCleanupParser calls. Fixes bug #327729. Thanks to Itay Perl <itay.p... (diff) | |
| download | gentoo-2-757aea4ea2232a403a8c6028d9fe83cb84639eac.tar.gz gentoo-2-757aea4ea2232a403a8c6028d9fe83cb84639eac.tar.bz2 gentoo-2-757aea4ea2232a403a8c6028d9fe83cb84639eac.zip | |
Fix linking error with xfce4-panel >= 4.7.
(Portage version: 2.2_rc67/cvs/Linux x86_64)
Diffstat (limited to 'xfce-extra/xfce4-wavelan-plugin')
3 files changed, 50 insertions, 5 deletions
diff --git a/xfce-extra/xfce4-wavelan-plugin/ChangeLog b/xfce-extra/xfce4-wavelan-plugin/ChangeLog index 050d63fd0e37..8c3c6e92ae9a 100644 --- a/xfce-extra/xfce4-wavelan-plugin/ChangeLog +++ b/xfce-extra/xfce4-wavelan-plugin/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for xfce-extra/xfce4-wavelan-plugin -# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/xfce-extra/xfce4-wavelan-plugin/ChangeLog,v 1.6 2009/09/05 15:34:54 ranger Exp $ +# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/xfce-extra/xfce4-wavelan-plugin/ChangeLog,v 1.7 2010/08/05 22:47:22 ssuominen Exp $ + + 05 Aug 2010; Samuli Suominen <ssuominen@gentoo.org> + xfce4-wavelan-plugin-0.5.5.ebuild, + +files/xfce4-wavelan-plugin-0.5.5-libs_for_xfce_create_header.patch: + Fix linking error with xfce4-panel >= 4.7. 05 Sep 2009; Brent Baude <ranger@gentoo.org> xfce4-wavelan-plugin-0.5.5.ebuild: diff --git a/xfce-extra/xfce4-wavelan-plugin/files/xfce4-wavelan-plugin-0.5.5-libs_for_xfce_create_header.patch b/xfce-extra/xfce4-wavelan-plugin/files/xfce4-wavelan-plugin-0.5.5-libs_for_xfce_create_header.patch new file mode 100644 index 000000000000..d5298adff79b --- /dev/null +++ b/xfce-extra/xfce4-wavelan-plugin/files/xfce4-wavelan-plugin-0.5.5-libs_for_xfce_create_header.patch @@ -0,0 +1,37 @@ +Because xfce4-panel is using libxfce4ui instead of libxfcegui4 the flags won't get inherited anymore. + +xfce4_wavelan_plugin-wavelan.o: In function `wavelan_configure': +wavelan.c:(.text+0xed9): undefined reference to `xfce_create_header' + +--- configure.in ++++ configure.in +@@ -49,6 +49,7 @@ + + dnl configure the panel plugin + XDT_CHECK_PACKAGE([LIBXFCE4UTIL], [libxfce4util-1.0], [4.3.20]) ++XDT_CHECK_PACKAGE([LIBXFCEGUI4], [libxfcegui4-1.0], [4.3.20]) + XDT_CHECK_PACKAGE([LIBXFCE4PANEL], [libxfce4panel-1.0], [4.3.20]) + XDT_CHECK_PACKAGE([GTK], [gtk+-2.0], [2.6.0]) + +--- panel-plugin/Makefile.am ++++ panel-plugin/Makefile.am +@@ -11,7 +11,8 @@ + # libwavelan.la + + xfce4_wavelan_plugin_LDFLAGS = \ +- @LIBXFCE4PANEL_LIBS@ ++ @LIBXFCE4PANEL_LIBS@ \ ++ @LIBXFCEGUI4_LIBS@ + + xfce4_wavelan_plugin_SOURCES = \ + wavelan.c \ +@@ -21,7 +22,8 @@ + wi_linux.c + + xfce4_wavelan_plugin_CFLAGS = \ +- @LIBXFCE4PANEL_CFLAGS@ ++ @LIBXFCE4PANEL_CFLAGS@ \ ++ @LIBXFCEGUI4_CFLAGS@ + + # .desktop file + # diff --git a/xfce-extra/xfce4-wavelan-plugin/xfce4-wavelan-plugin-0.5.5.ebuild b/xfce-extra/xfce4-wavelan-plugin/xfce4-wavelan-plugin-0.5.5.ebuild index b1ba4062859f..7a1e00f841da 100644 --- a/xfce-extra/xfce4-wavelan-plugin/xfce4-wavelan-plugin-0.5.5.ebuild +++ b/xfce-extra/xfce4-wavelan-plugin/xfce4-wavelan-plugin-0.5.5.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-wavelan-plugin/xfce4-wavelan-plugin-0.5.5.ebuild,v 1.6 2009/09/05 15:34:54 ranger Exp $ +# $Header: /var/cvsroot/gentoo-x86/xfce-extra/xfce4-wavelan-plugin/xfce4-wavelan-plugin-0.5.5.ebuild,v 1.7 2010/08/05 22:47:21 ssuominen Exp $ EAPI=2 +EAUTORECONF=yes inherit xfconf DESCRIPTION="Wireless monitor panel plugin" @@ -15,6 +16,7 @@ KEYWORDS="amd64 ~arm hppa ppc ppc64 x86" IUSE="debug" RDEPEND=">=xfce-base/xfce4-panel-4.3.20 + >=xfce-base/libxfcegui4-4.3.20 >=xfce-base/libxfce4util-4.3.20 >=x11-libs/gtk+-2.6:2" DEPEND="${RDEPEND} @@ -24,5 +26,6 @@ DEPEND="${RDEPEND} pkg_setup() { DOCS="AUTHORS ChangeLog NEWS README THANKS" XFCONF="--disable-dependency-tracking - $(use_enable debug)" + $(xfconf_use_debug)" + PATCHES=( "${FILESDIR}"/${P}-libs_for_xfce_create_header.patch ) } |