diff options
| author |   Samuli Suominen <ssuominen@gentoo.org> | 2011-01-29 14:35:36 +0000 |
|---|---|---|
| committer | Samuli Suominen <ssuominen@gentoo.org> | 2011-01-29 14:35:36 +0000 |
| commit | 67ce98542e218dc53199f10c9eff6799e34834ec (patch) | |
| tree | e13eeae42b91693f8ae2353d34e941bf6bb1a046 /xfce-extra | |
| parent | punt old, broken (diff) | |
| download | historical-67ce98542e218dc53199f10c9eff6799e34834ec.tar.gz historical-67ce98542e218dc53199f10c9eff6799e34834ec.tar.bz2 historical-67ce98542e218dc53199f10c9eff6799e34834ec.zip | |
Fix building with x11-libs/libnotify >= 0.7.
Package-Manager: portage-2.2.0_alpha19/cvs/Linux x86_64
Diffstat (limited to 'xfce-extra')
4 files changed, 41 insertions, 5 deletions
diff --git a/xfce-extra/xfce4-power-manager/ChangeLog b/xfce-extra/xfce4-power-manager/ChangeLog index 10d18fd5d014..b97cb43840dc 100644 --- a/xfce-extra/xfce4-power-manager/ChangeLog +++ b/xfce-extra/xfce4-power-manager/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for xfce-extra/xfce4-power-manager # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/xfce-extra/xfce4-power-manager/ChangeLog,v 1.33 2011/01/17 15:11:27 xarthisius Exp $ +# $Header: /var/cvsroot/gentoo-x86/xfce-extra/xfce4-power-manager/ChangeLog,v 1.34 2011/01/29 14:35:36 ssuominen Exp $ + + 29 Jan 2011; Samuli Suominen <ssuominen@gentoo.org> + xfce4-power-manager-1.0.3.ebuild, + +files/xfce4-power-manager-1.0.3-libnotify-0.7.patch: + Fix building with x11-libs/libnotify >= 0.7. 17 Jan 2011; Kacper Kowalik <xarthisius@gentoo.org> xfce4-power-manager-1.0.3.ebuild: diff --git a/xfce-extra/xfce4-power-manager/Manifest b/xfce-extra/xfce4-power-manager/Manifest index 3421e812f26c..35cf58ecf158 100644 --- a/xfce-extra/xfce4-power-manager/Manifest +++ b/xfce-extra/xfce4-power-manager/Manifest @@ -1,4 +1,5 @@ +AUX xfce4-power-manager-1.0.3-libnotify-0.7.patch 606 RMD160 fe044df9e89f8318bc080ce8cc044f60cdccdb50 SHA1 bcac1d6b6fe7061acd96972eba3b6584ab55a149 SHA256 d59ad4ba436d6a843d8edc1d7e0d9378f975470e8e25635c17c3018b28d58180 DIST xfce4-power-manager-1.0.3.tar.bz2 1022858 RMD160 18609c2055213defaefe82e018fdf70eab9be197 SHA1 9d0ad4232f93af3e0c1a926ef896924fecd57f38 SHA256 9bb7487a652337335c00aafa4152e3ad0eaf24525a38d8df646e4950c42d61cf -EBUILD xfce4-power-manager-1.0.3.ebuild 1587 RMD160 bc6c227ee08bbaec10345fdae6114062820ae3b7 SHA1 5af5ce6c3a414bb8620f892994f50d647e04daea SHA256 16a5847a74c152b103054c64e0232131bea0714287fafdcfd0e8a16f8f597a7d -MISC ChangeLog 5445 RMD160 527cb615024d61a6070406fdbe9106d08dfd327b SHA1 6638f17eb1c159ff96e245ea16fe1261e1a58763 SHA256 fcbbd3aaa3f30531a868a77cf193a4d0527bd2614540b6edd60661df70e6019a +EBUILD xfce4-power-manager-1.0.3.ebuild 1731 RMD160 4a9e6f04daf93a21c3ccd6f42bef90cda2fbca3f SHA1 9c768ef43d14aa8625c84113fae0965d17f58f5a SHA256 732823f27d243b1ff21c60214bcc02866341eb71aa2b214a8d9245b8b76c568d +MISC ChangeLog 5638 RMD160 883f1ed498010b8ba95940dda717010c3e7aa3b3 SHA1 44528fdb6691eb9dca16eb25d3c0bbb24fede509 SHA256 29c9d032992df8a15ec47ccf0a95c4823e75fcb1ea892d4b79dc382b2d3f3357 MISC metadata.xml 159 RMD160 43722935bd7b4db7fe8db681054f2e53c4a5f7ce SHA1 15958ad72e234ba572c9534533c21532eb6bc0fd SHA256 900ea49b6703fce452e205b85226bf1f994725963e5840da501182e7487d0e63 diff --git a/xfce-extra/xfce4-power-manager/files/xfce4-power-manager-1.0.3-libnotify-0.7.patch b/xfce-extra/xfce4-power-manager/files/xfce4-power-manager-1.0.3-libnotify-0.7.patch new file mode 100644 index 000000000000..206524a507be --- /dev/null +++ b/xfce-extra/xfce4-power-manager/files/xfce4-power-manager-1.0.3-libnotify-0.7.patch @@ -0,0 +1,27 @@ +http://bugzilla.xfce.org/show_bug.cgi?id=7205 + +--- src/xfpm-notify.c ++++ src/xfpm-notify.c +@@ -209,13 +209,20 @@ + { + NotifyNotification *n; + +- n = notify_notification_new (title, message, NULL, NULL); ++ n = notify_notification_new (title, message, NULL ++#ifdef HAVE_LIBNOTIFY_07 ++ ); ++#else ++ , NULL); ++#endif + + if ( icon_name ) + xfpm_notify_set_notification_icon (n, icon_name); +- ++ ++#ifndef HAVE_LIBNOTIFY_07 + if ( icon ) + notify_notification_attach_to_status_icon (n, icon); ++#endif + + notify_notification_set_urgency (n, (NotifyUrgency)urgency); + diff --git a/xfce-extra/xfce4-power-manager/xfce4-power-manager-1.0.3.ebuild b/xfce-extra/xfce4-power-manager/xfce4-power-manager-1.0.3.ebuild index fbe21b9717cf..663fafd096ef 100644 --- a/xfce-extra/xfce4-power-manager/xfce4-power-manager-1.0.3.ebuild +++ b/xfce-extra/xfce4-power-manager/xfce4-power-manager-1.0.3.ebuild @@ -1,9 +1,9 @@ # Copyright 1999-2011 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/xfce-extra/xfce4-power-manager/xfce4-power-manager-1.0.3.ebuild,v 1.3 2011/01/17 15:11:27 xarthisius Exp $ +# $Header: /var/cvsroot/gentoo-x86/xfce-extra/xfce4-power-manager/xfce4-power-manager-1.0.3.ebuild,v 1.4 2011/01/29 14:35:36 ssuominen Exp $ EAPI=3 -inherit xfconf +inherit flag-o-matic xfconf DESCRIPTION="Power manager for the Xfce desktop environment" HOMEPAGE="http://goodies.xfce.org/projects/applications/xfce4-power-manager" @@ -37,6 +37,9 @@ DEPEND="${COMMON_DEPEND} x11-proto/xproto" pkg_setup() { + has_version ">=x11-libs/libnotify-0.7" && append-cppflags -DHAVE_LIBNOTIFY_07 + PATCHES=( "${FILESDIR}"/${P}-libnotify-0.7.patch ) + XFCONF=( --disable-dependency-tracking $(use_enable policykit polkit) |