diff options
| author |   Samuli Suominen <ssuominen@gentoo.org> | 2010-09-22 11:51:49 +0000 |
|---|---|---|
| committer | Samuli Suominen <ssuominen@gentoo.org> | 2010-09-22 11:51:49 +0000 |
| commit | db2fc4f2f2f96fba71340448e7a344336ffd0463 (patch) | |
| tree | e455ee754f6a8053e286992151847e08b641c977 /xfce-extra | |
| parent | Version bump. (diff) | |
| download | historical-db2fc4f2f2f96fba71340448e7a344336ffd0463.tar.gz historical-db2fc4f2f2f96fba71340448e7a344336ffd0463.tar.bz2 historical-db2fc4f2f2f96fba71340448e7a344336ffd0463.zip | |
Fix building with xfce4-panel >= 4.7.
Package-Manager: portage-2.2_rc84/cvs/Linux x86_64
Diffstat (limited to 'xfce-extra')
4 files changed, 38 insertions, 6 deletions
diff --git a/xfce-extra/xfce4-linelight-plugin/ChangeLog b/xfce-extra/xfce4-linelight-plugin/ChangeLog index ad36272ee8a1..8d201c9d3074 100644 --- a/xfce-extra/xfce4-linelight-plugin/ChangeLog +++ b/xfce-extra/xfce4-linelight-plugin/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for xfce-extra/xfce4-linelight-plugin # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/xfce-extra/xfce4-linelight-plugin/ChangeLog,v 1.3 2010/01/15 03:17:00 ssuominen Exp $ +# $Header: /var/cvsroot/gentoo-x86/xfce-extra/xfce4-linelight-plugin/ChangeLog,v 1.4 2010/09/22 11:51:49 ssuominen Exp $ + + 22 Sep 2010; Samuli Suominen <ssuominen@gentoo.org> + xfce4-linelight-plugin-0.1.6.ebuild, + +files/xfce4-linelight-plugin-0.1.6-libxfce4panel_h.patch: + Fix building with xfce4-panel >= 4.7. 15 Jan 2010; Samuli Suominen <ssuominen@gentoo.org> xfce4-linelight-plugin-0.1.6.ebuild: diff --git a/xfce-extra/xfce4-linelight-plugin/Manifest b/xfce-extra/xfce4-linelight-plugin/Manifest index dac6168fcaaf..ac3b22961f5c 100644 --- a/xfce-extra/xfce4-linelight-plugin/Manifest +++ b/xfce-extra/xfce4-linelight-plugin/Manifest @@ -1,4 +1,5 @@ +AUX xfce4-linelight-plugin-0.1.6-libxfce4panel_h.patch 638 RMD160 eeb24ead83d0063dfac991727dc2920f68f1f813 SHA1 aad223df1cac60ed8fd9c0354da90c1548f2908a SHA256 f998a428bbf58c6b534ae573bc64bad5482596ea15b157ce9cbdccaad3284a71 DIST xfce4-linelight-plugin-0.1.6.tar.bz2 234256 RMD160 7abf7874c68466cc4a3bc2d59f49aaea68230895 SHA1 34cf2b0bb8ed6623b021ad2a3331dab7b4cf08b1 SHA256 66a5ed34cad23d0bbdc7ca03ddc45cd21e0363cd0edf50e358790288f58bbf05 -EBUILD xfce4-linelight-plugin-0.1.6.ebuild 818 RMD160 79b8adeb4bf91f09657f3f9cc3ef388159b50844 SHA1 d2ada9ea6b29282e460d1566a5e7997e5d296295 SHA256 c1f7e232c461a34bc671f8e8c379fe1a63b8c63f8367581612e2470202273a11 -MISC ChangeLog 644 RMD160 15cbeeb6244f1c4ee7f2d720d49167bde3f0c805 SHA1 f1ee260ebaaaf24742a16520bdc2a55ef3b74680 SHA256 8cad87282e64d82d32a6f6637a437a17966a46c8329df46284e26db96c73e7f2 +EBUILD xfce4-linelight-plugin-0.1.6.ebuild 901 RMD160 ee27b251de14c9ac76fca87da341575e38a987f7 SHA1 49e485c9d00ffcc33e0e3d36bc4899b436590635 SHA256 71d6440bf9998cf4611ffe14ad1ddcb108955db7b889653ed7ec70797fd35245 +MISC ChangeLog 839 RMD160 ea7840abdfc34fee10a2530a82fdae568065593c SHA1 e2ab4ca5873a526e407d019abfa4bcd2624f4cdc SHA256 5ee4161e35eba95ea7896d47682e329c3b64617073b1716bc6e84d94bea87341 MISC metadata.xml 159 RMD160 43722935bd7b4db7fe8db681054f2e53c4a5f7ce SHA1 15958ad72e234ba572c9534533c21532eb6bc0fd SHA256 900ea49b6703fce452e205b85226bf1f994725963e5840da501182e7487d0e63 diff --git a/xfce-extra/xfce4-linelight-plugin/files/xfce4-linelight-plugin-0.1.6-libxfce4panel_h.patch b/xfce-extra/xfce4-linelight-plugin/files/xfce4-linelight-plugin-0.1.6-libxfce4panel_h.patch new file mode 100644 index 000000000000..cca95d55bc4d --- /dev/null +++ b/xfce-extra/xfce4-linelight-plugin/files/xfce4-linelight-plugin-0.1.6-libxfce4panel_h.patch @@ -0,0 +1,25 @@ +--- panel-plugin/linelight.c ++++ panel-plugin/linelight.c +@@ -21,8 +21,7 @@ + + #include <libxfcegui4/libxfcegui4.h> + +-#include <libxfce4panel/xfce-panel-plugin.h> +-#include <libxfce4panel/xfce-panel-convenience.h> ++#include <libxfce4panel/libxfce4panel.h> + + #include <thunar-vfs/thunar-vfs.h> + +--- panel-plugin/main.c ++++ panel-plugin/main.c +@@ -32,9 +32,7 @@ + + #include <libxfcegui4/libxfcegui4.h> + +-#include <libxfce4panel/xfce-panel-window.h> +-#include <libxfce4panel/xfce-panel-plugin.h> +-#include <libxfce4panel/xfce-panel-convenience.h> ++#include <libxfce4panel/libxfce4panel.h> + + #include "linelight.h" + #include "defines.h" diff --git a/xfce-extra/xfce4-linelight-plugin/xfce4-linelight-plugin-0.1.6.ebuild b/xfce-extra/xfce4-linelight-plugin/xfce4-linelight-plugin-0.1.6.ebuild index 0588280a1bf8..ea085936507d 100644 --- a/xfce-extra/xfce4-linelight-plugin/xfce4-linelight-plugin-0.1.6.ebuild +++ b/xfce-extra/xfce4-linelight-plugin/xfce4-linelight-plugin-0.1.6.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2010 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/xfce-extra/xfce4-linelight-plugin/xfce4-linelight-plugin-0.1.6.ebuild,v 1.3 2010/01/15 03:17:00 ssuominen Exp $ +# $Header: /var/cvsroot/gentoo-x86/xfce-extra/xfce4-linelight-plugin/xfce4-linelight-plugin-0.1.6.ebuild,v 1.4 2010/09/22 11:51:49 ssuominen Exp $ EAPI=2 inherit xfconf @@ -16,7 +16,7 @@ IUSE="" RDEPEND=">=xfce-base/xfce4-panel-4.4 >=xfce-base/libxfcegui4-4.4 - <xfce-base/thunar-1.1.0 + || ( xfce-extra/thunar-vfs <xfce-base/thunar-1.1.0 ) >=x11-libs/gtk+-2.12:2 >=dev-libs/glib-2.16:2" DEPEND="${RDEPEND} @@ -24,6 +24,7 @@ DEPEND="${RDEPEND} sys-devel/gettext" pkg_setup() { - DOCS="AUTHORS ChangeLog NEWS" + PATCHES=( "${FILESDIR}"/${P}-libxfce4panel_h.patch ) XFCONF="--disable-dependency-tracking" + DOCS="AUTHORS ChangeLog NEWS" } |