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 | f480783979e5fb8fa57900ffd159446a17b1a5d2 (patch) | |
| tree | 4004669a54e8d6ba567a5307dc8d674f09f1c1a4 /xfce-extra | |
| parent | Stable on amd64 wrt bug #329807 (diff) | |
| download | historical-f480783979e5fb8fa57900ffd159446a17b1a5d2.tar.gz historical-f480783979e5fb8fa57900ffd159446a17b1a5d2.tar.bz2 historical-f480783979e5fb8fa57900ffd159446a17b1a5d2.zip | |
Include libxfce4panel.h instead of separate headers wrt #331491 by Diego E. Pettenò.
Package-Manager: portage-2.2_rc67/cvs/Linux x86_64
Diffstat (limited to 'xfce-extra')
4 files changed, 47 insertions, 10 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/Manifest b/xfce-extra/xfce4-wmdock-plugin/Manifest index cef3d50901ba..a022f06b9657 100644 --- a/xfce-extra/xfce4-wmdock-plugin/Manifest +++ b/xfce-extra/xfce4-wmdock-plugin/Manifest @@ -1,4 +1,5 @@ +AUX xfce4-wmdock-plugin-0.3.2-libxfce4panel_h.patch 867 RMD160 4829e042f5459b4bff2ecaa67de9799791351415 SHA1 f9ee58e4bf048884d89432768d80e275b91b2b9b SHA256 384f000612e3231ec75b61af7fae13bb31cc1fb61078412e8bb294dcc88e0a82 DIST xfce4-wmdock-plugin-0.3.2.tar.bz2 304940 RMD160 cc396da41254a36d2bfae2c862873ac6cc07a4ff SHA1 c892678af7303b180a21feaf2a29b736474afe12 SHA256 8573ccb2d754d9ef63369eeea00e671618ddf1b39344f44ab10fe92396aed66b -EBUILD xfce4-wmdock-plugin-0.3.2.ebuild 1016 RMD160 50f07c5216a326d7f4a0b8d0a46b3c68782ae5e2 SHA1 deba4242325adef71b7033356b8d61b8960eed45 SHA256 daa4972f5ff2cb4a9cfee832ae8d161528f858d97abcce9931b2aa3c0dc62a4d -MISC ChangeLog 738 RMD160 134b333587c32c3bd8a914aa66b3eef2ef2addb3 SHA1 2dbb516d50b1be4cccc5d1f2accd2eb6e996d706 SHA256 dea8ca38105f2f5b4600f637e28a55abb7f2892e9d55c9ab80645e6a796af6b5 +EBUILD xfce4-wmdock-plugin-0.3.2.ebuild 1069 RMD160 4fee37a98508016ebad16de23b66fe2ad34c4657 SHA1 60264c69ca36e917ea55c34e0dcf7c567a6ff9f6 SHA256 1d9e698648126a8b6efb1d7c1cb3ab44b77e16d0de1bf19442628b8192159177 +MISC ChangeLog 981 RMD160 32243a7d0ea51c5a872a1c23052766ee414d89bc SHA1 afeeb052fd9d21af9b2d37052b7324cad7ce658d SHA256 51ffee3eb24d7f22c8ebe773a799514cd7d82274b649d915f941f9b06dcc7479 MISC metadata.xml 159 RMD160 43722935bd7b4db7fe8db681054f2e53c4a5f7ce SHA1 15958ad72e234ba572c9534533c21532eb6bc0fd SHA256 900ea49b6703fce452e205b85226bf1f994725963e5840da501182e7487d0e63 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 } |