diff options
| author |   Samuli Suominen <ssuominen@gentoo.org> | 2010-08-09 11:04:06 +0000 |
|---|---|---|
| committer | Samuli Suominen <ssuominen@gentoo.org> | 2010-08-09 11:04:06 +0000 |
| commit | 089fb0210b9704342471c129c0ee63ec525fbab7 (patch) | |
| tree | 707c66bff073f7cd24599d4e52d0f7937da109e6 /xfce-extra | |
| parent | bug #330023 (diff) | |
| download | gentoo-2-089fb0210b9704342471c129c0ee63ec525fbab7.tar.gz gentoo-2-089fb0210b9704342471c129c0ee63ec525fbab7.tar.bz2 gentoo-2-089fb0210b9704342471c129c0ee63ec525fbab7.zip | |
Link to libxfcegui4 wrt #331497 by Diego E. Pettenò.
(Portage version: 2.2_rc67/cvs/Linux x86_64)
Diffstat (limited to 'xfce-extra')
3 files changed, 51 insertions, 10 deletions
diff --git a/xfce-extra/xfce4-netload-plugin/ChangeLog b/xfce-extra/xfce4-netload-plugin/ChangeLog index a253a8cd4a9c..e0c04a59e9ed 100644 --- a/xfce-extra/xfce4-netload-plugin/ChangeLog +++ b/xfce-extra/xfce4-netload-plugin/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for xfce-extra/xfce4-netload-plugin # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/xfce-extra/xfce4-netload-plugin/ChangeLog,v 1.10 2010/01/19 00:20:05 jer Exp $ +# $Header: /var/cvsroot/gentoo-x86/xfce-extra/xfce4-netload-plugin/ChangeLog,v 1.11 2010/08/09 11:04:06 ssuominen Exp $ + + 09 Aug 2010; Samuli Suominen <ssuominen@gentoo.org> + xfce4-netload-plugin-0.4.0-r1.ebuild, + +files/xfce4-netload-plugin-0.4.0-link_to_libxfcegui4.patch: + Link to libxfcegui4 wrt #331497 by Diego E. Pettenò. 19 Jan 2010; Jeroen Roovers <jer@gentoo.org> xfce4-netload-plugin-0.4.0-r1.ebuild: diff --git a/xfce-extra/xfce4-netload-plugin/files/xfce4-netload-plugin-0.4.0-link_to_libxfcegui4.patch b/xfce-extra/xfce4-netload-plugin/files/xfce4-netload-plugin-0.4.0-link_to_libxfcegui4.patch new file mode 100644 index 000000000000..585534572524 --- /dev/null +++ b/xfce-extra/xfce4-netload-plugin/files/xfce4-netload-plugin-0.4.0-link_to_libxfcegui4.patch @@ -0,0 +1,31 @@ +http://bugzilla.xfce.org/show_bug.cgi?id=6622 +http://bugs.gentoo.org/show_bug.cgi?id=331497 + +--- configure.ac ++++ configure.ac +@@ -53,6 +53,7 @@ + + dnl configure the panel plugin + XDT_CHECK_PACKAGE([LIBXFCE4PANEL], [libxfce4panel-1.0], [4.3.20]) ++XDT_CHECK_PACKAGE([LIBXFCEGUI4], [libxfcegui4-1.0], [4.3.20]) + + dnl Check for i18n support + XDT_I18N([ca de fr ko lt pl uk]) +--- panel-plugin/Makefile.am ++++ panel-plugin/Makefile.am +@@ -16,11 +16,13 @@ + + xfce4_netload_plugin_CFLAGS = \ + -DPACKAGE_LOCALE_DIR=\"$(localedir)\" \ +- @LIBXFCE4PANEL_CFLAGS@ ++ @LIBXFCE4PANEL_CFLAGS@ \ ++ @LIBXFCEGUI4_CFLAGS@ + + xfce4_netload_plugin_LDADD = \ + @SOLLIBS@ \ +- @LIBXFCE4PANEL_LIBS@ ++ @LIBXFCE4PANEL_LIBS@ \ ++ @LIBXFCEGUI4_LIBS@ + + # .desktop file + # diff --git a/xfce-extra/xfce4-netload-plugin/xfce4-netload-plugin-0.4.0-r1.ebuild b/xfce-extra/xfce4-netload-plugin/xfce4-netload-plugin-0.4.0-r1.ebuild index 189acb3dbadb..f7beec485419 100644 --- a/xfce-extra/xfce4-netload-plugin/xfce4-netload-plugin-0.4.0-r1.ebuild +++ b/xfce-extra/xfce4-netload-plugin/xfce4-netload-plugin-0.4.0-r1.ebuild @@ -1,10 +1,10 @@ # Copyright 1999-2010 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/xfce-extra/xfce4-netload-plugin/xfce4-netload-plugin-0.4.0-r1.ebuild,v 1.9 2010/01/19 00:20:05 jer Exp $ +# $Header: /var/cvsroot/gentoo-x86/xfce-extra/xfce4-netload-plugin/xfce4-netload-plugin-0.4.0-r1.ebuild,v 1.10 2010/08/09 11:04:06 ssuominen Exp $ +EAPI=2 EAUTORECONF=yes EINTLTOOLIZE=yes -EAPI=2 inherit xfconf DESCRIPTION="Netload plugin for Xfce4 panel" @@ -16,21 +16,26 @@ SLOT="0" KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 sparc x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux" IUSE="debug" -RDEPEND=">=xfce-base/xfce4-panel-4.3.20" +RDEPEND=">=xfce-base/libxfcegui4-4.3.20 + >=xfce-base/xfce4-panel-4.3.20" DEPEND="${RDEPEND} dev-util/pkgconfig dev-util/intltool" pkg_setup() { - PATCHES=( "${FILESDIR}/${P}-asneeded.patch" - "${FILESDIR}/${P}-fix-tooltips-gtk2.16.patch" ) - DOCS="AUTHORS ChangeLog README" + PATCHES=( + "${FILESDIR}"/${P}-asneeded.patch + "${FILESDIR}"/${P}-link_to_libxfcegui4.patch + "${FILESDIR}"/${P}-fix-tooltips-gtk2.16.patch + ) XFCONF="--disable-dependency-tracking - $(use_enable debug)" + $(xfconf_use_debug)" + DOCS="AUTHORS ChangeLog README" } src_prepare() { - sed -i -e "/^AC_INIT/s/netload_version()/netload_version/" configure.ac \ - || die "sed failed" + sed -i \ + -e '/^AC_INIT/s/netload_version()/netload_version/' \ + configure.ac || die xfconf_src_prepare } |