summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSamuli Suominen <ssuominen@gentoo.org>2011-01-29 19:35:19 +0000
committerSamuli Suominen <ssuominen@gentoo.org>2011-01-29 19:35:19 +0000
commit0be24cc5303ce1ca2bf8ab0409f89f44e89e945c (patch)
tree74a6d0ceb6f2ce8e420d2b301fbdbdf67c6efff2 /xfce-extra/xfce4-volumed
parentold, and punt the gawdawful update script (diff)
downloadgentoo-2-0be24cc5303ce1ca2bf8ab0409f89f44e89e945c.tar.gz
gentoo-2-0be24cc5303ce1ca2bf8ab0409f89f44e89e945c.tar.bz2
gentoo-2-0be24cc5303ce1ca2bf8ab0409f89f44e89e945c.zip
Version bump.
(Portage version: 2.2.0_alpha19/cvs/Linux x86_64)
Diffstat (limited to 'xfce-extra/xfce4-volumed')
-rw-r--r--xfce-extra/xfce4-volumed/ChangeLog11
-rw-r--r--xfce-extra/xfce4-volumed/files/xfce4-volumed-0.1.11-libnotify-0.7.patch25
-rw-r--r--xfce-extra/xfce4-volumed/xfce4-volumed-0.1.11.ebuild (renamed from xfce-extra/xfce4-volumed/xfce4-volumed-0.1.10.ebuild)15
3 files changed, 44 insertions, 7 deletions
diff --git a/xfce-extra/xfce4-volumed/ChangeLog b/xfce-extra/xfce4-volumed/ChangeLog
index 52e80ba6cb10..c8c8fa672bd4 100644
--- a/xfce-extra/xfce4-volumed/ChangeLog
+++ b/xfce-extra/xfce4-volumed/ChangeLog
@@ -1,6 +1,13 @@
# ChangeLog for xfce-extra/xfce4-volumed
-# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/xfce-extra/xfce4-volumed/ChangeLog,v 1.12 2010/11/02 16:39:15 ssuominen Exp $
+# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/xfce-extra/xfce4-volumed/ChangeLog,v 1.13 2011/01/29 19:35:19 ssuominen Exp $
+
+*xfce4-volumed-0.1.11 (29 Jan 2011)
+
+ 29 Jan 2011; Samuli Suominen <ssuominen@gentoo.org>
+ +xfce4-volumed-0.1.11.ebuild,
+ +files/xfce4-volumed-0.1.11-libnotify-0.7.patch:
+ Version bump.
*xfce4-volumed-0.1.10 (02 Nov 2010)
diff --git a/xfce-extra/xfce4-volumed/files/xfce4-volumed-0.1.11-libnotify-0.7.patch b/xfce-extra/xfce4-volumed/files/xfce4-volumed-0.1.11-libnotify-0.7.patch
new file mode 100644
index 000000000000..5415354a781b
--- /dev/null
+++ b/xfce-extra/xfce4-volumed/files/xfce4-volumed-0.1.11-libnotify-0.7.patch
@@ -0,0 +1,25 @@
+http://bugs.launchpad.net/xfce4-volumed/+bug/671915
+
+--- src/xvd_notify.c
++++ src/xvd_notify.c
+@@ -117,11 +117,15 @@
+ g_list_free (caps_list);
+ }
+
+- Inst->notification = notify_notification_new (
+- "Xfce4-Volumed",
+- NULL,
+- NULL,
+- NULL);
++#ifdef NOTIFY_CHECK_VERSION
++#if NOTIFY_CHECK_VERSION (0, 7, 0)
++ Inst->notification = notify_notification_new ("Xfce4-Volumed", NULL, NULL);
++#else
++ Inst->notification = notify_notification_new ("Xfce4-Volumed", NULL, NULL, NULL);
++#endif
++#else
++ Inst->notification = notify_notification_new ("Xfce4-Volumed", NULL, NULL, NULL);
++#endif
+ }
+
+ void
diff --git a/xfce-extra/xfce4-volumed/xfce4-volumed-0.1.10.ebuild b/xfce-extra/xfce4-volumed/xfce4-volumed-0.1.11.ebuild
index ebed55c8e496..fd778877230d 100644
--- a/xfce-extra/xfce4-volumed/xfce4-volumed-0.1.10.ebuild
+++ b/xfce-extra/xfce4-volumed/xfce4-volumed-0.1.11.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2010 Gentoo Foundation
+# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/xfce-extra/xfce4-volumed/xfce4-volumed-0.1.10.ebuild,v 1.1 2010/11/02 16:39:15 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/xfce-extra/xfce4-volumed/xfce4-volumed-0.1.11.ebuild,v 1.1 2011/01/29 19:35:19 ssuominen Exp $
-EAPI=2
+EAPI=3
inherit xfconf
DESCRIPTION="Daemon to control volume up/down and mute keys"
@@ -25,8 +25,13 @@ DEPEND="${COMMON_DEPEND}
dev-util/pkgconfig"
pkg_setup() {
- XFCONF="--disable-dependency-tracking
+ PATCHES=( "${FILESDIR}"/${P}-libnotify-0.7.patch )
+
+ XFCONF=(
+ --disable-dependency-tracking
$(use_enable debug)
- $(use_with libnotify)"
+ $(use_with libnotify)
+ )
+
DOCS="AUTHORS ChangeLog README THANKS"
}