diff options
| author |   Samuli Suominen <ssuominen@gentoo.org> | 2010-08-08 12:29:33 +0000 |
|---|---|---|
| committer | Samuli Suominen <ssuominen@gentoo.org> | 2010-08-08 12:29:33 +0000 |
| commit | 1fc73e89401faf9acfb96bdd8ae9c4541c1f2777 (patch) | |
| tree | 98f2e1f152152657f32b20a222fe4de25609c589 /xfce-extra | |
| parent | Stable on amd64 wrt bug #329807 (diff) | |
| download | gentoo-2-1fc73e89401faf9acfb96bdd8ae9c4541c1f2777.tar.gz gentoo-2-1fc73e89401faf9acfb96bdd8ae9c4541c1f2777.tar.bz2 gentoo-2-1fc73e89401faf9acfb96bdd8ae9c4541c1f2777.zip | |
Include libxfce4panel.h instead of separate headers wrt #331491 by Diego E. Pettenò.
(Portage version: 2.2_rc67/cvs/Linux x86_64)
Diffstat (limited to 'xfce-extra')
3 files changed, 44 insertions, 8 deletions
diff --git a/xfce-extra/xfce4-wmdock-plugin/ChangeLog b/xfce-extra/xfce4-wmdock-plugin/ChangeLog index 5a39a4effd6b..26f4b1c419a9 100644 --- a/xfce-extra/xfce4-wmdock-plugin/ChangeLog +++ b/xfce-extra/xfce4-wmdock-plugin/ChangeLog @@ -1,6 +1,12 @@ # ChangeLog for xfce-extra/xfce4-wmdock-plugin -# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/xfce-extra/xfce4-wmdock-plugin/ChangeLog,v 1.3 2009/08/26 10:22:50 fauli Exp $ +# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/xfce-extra/xfce4-wmdock-plugin/ChangeLog,v 1.4 2010/08/08 12:29:33 ssuominen Exp $ + + 08 Aug 2010; Samuli Suominen <ssuominen@gentoo.org> + xfce4-wmdock-plugin-0.3.2.ebuild, + +files/xfce4-wmdock-plugin-0.3.2-libxfce4panel_h.patch: + Include libxfce4panel.h instead of separate headers wrt #331491 by Diego + E. Pettenò. 26 Aug 2009; Christian Faulhammer <fauli@gentoo.org> xfce4-wmdock-plugin-0.3.2.ebuild: diff --git a/xfce-extra/xfce4-wmdock-plugin/files/xfce4-wmdock-plugin-0.3.2-libxfce4panel_h.patch b/xfce-extra/xfce4-wmdock-plugin/files/xfce4-wmdock-plugin-0.3.2-libxfce4panel_h.patch new file mode 100644 index 000000000000..c592c9787c2a --- /dev/null +++ b/xfce-extra/xfce4-wmdock-plugin/files/xfce4-wmdock-plugin-0.3.2-libxfce4panel_h.patch @@ -0,0 +1,29 @@ +http://bugs.gentoo.org/show_bug.cgi?id=331491 +http://bugzilla.xfce.org/show_bug.cgi?id=6619 + +--- panel-plugin/wmdock.c ++++ panel-plugin/wmdock.c +@@ -34,11 +34,7 @@ + #include <gtk/gtk.h> + #include <libxfce4util/libxfce4util.h> + #include <libxfcegui4/libxfcegui4.h> +-#include <libxfce4panel/xfce-panel-plugin.h> +-#include <libxfce4panel/xfce-panel-window.h> +-#include <libxfce4panel/xfce-hvbox.h> +-#include <libxfce4panel/xfce-arrow-button.h> +-#include <libxfce4panel/xfce-panel-convenience.h> ++#include <libxfce4panel/libxfce4panel.h> + + #include "wmdock.h" + #include "xfce4-wmdock-plugin.xpm" +--- panel-plugin/wmdock.h ++++ panel-plugin/wmdock.h +@@ -25,7 +25,7 @@ + #define __WMDOCK_H__ + + #include <gtk/gtk.h> +-#include <libxfce4panel/xfce-panel-plugin.h> ++#include <libxfce4panel/libxfce4panel.h> + + #define WNCK_I_KNOW_THIS_IS_UNSTABLE + #include <libwnck/libwnck.h> diff --git a/xfce-extra/xfce4-wmdock-plugin/xfce4-wmdock-plugin-0.3.2.ebuild b/xfce-extra/xfce4-wmdock-plugin/xfce4-wmdock-plugin-0.3.2.ebuild index 593f21b652f1..c2c18eaa2cb6 100644 --- a/xfce-extra/xfce4-wmdock-plugin/xfce4-wmdock-plugin-0.3.2.ebuild +++ b/xfce-extra/xfce4-wmdock-plugin/xfce4-wmdock-plugin-0.3.2.ebuild @@ -1,6 +1,6 @@ -# 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-wmdock-plugin/xfce4-wmdock-plugin-0.3.2.ebuild,v 1.3 2009/08/26 10:22:50 fauli Exp $ +# $Header: /var/cvsroot/gentoo-x86/xfce-extra/xfce4-wmdock-plugin/xfce4-wmdock-plugin-0.3.2.ebuild,v 1.4 2010/08/08 12:29:33 ssuominen Exp $ EAPI=2 inherit xfconf @@ -15,7 +15,7 @@ KEYWORDS="amd64 x86 ~x86-fbsd" IUSE="debug" RDEPEND=">=x11-libs/gtk+-2.6:2 - >=xfce-base/xfce4-panel-4.3.99.1 + >=xfce-base/xfce4-panel-4.6 >=xfce-base/libxfcegui4-4.3.90.2 >=xfce-base/libxfce4util-4.3.90.2 >=x11-libs/libwnck-2.8.1" @@ -25,12 +25,13 @@ DEPEND="${RDEPEND} dev-util/intltool" pkg_setup() { - DOCS="AUTHORS ChangeLog README TODO" + PATCHES=( "${FILESDIR}"/${P}-libxfce4panel_h.patch ) XFCONF="--disable-dependency-tracking - $(use_enable debug)" + $(xfconf_use_debug)" + DOCS="AUTHORS ChangeLog README TODO" } src_prepare() { - xfconf_src_prepare echo panel-plugin/wmdock.desktop.in.in >> po/POTFILES.skip + xfconf_src_prepare } |