summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSamuli Suominen <ssuominen@gentoo.org>2011-03-29 14:15:18 +0000
committerSamuli Suominen <ssuominen@gentoo.org>2011-03-29 14:15:18 +0000
commit4fd7ce389ffb87dd898b87b3ea8e2a5378bafb51 (patch)
tree58275b2f994564c5ec13479d38931af8fd5c55ba /gnome-extra/nm-applet
parentupdated to new patch set (diff)
downloadgentoo-2-4fd7ce389ffb87dd898b87b3ea8e2a5378bafb51.tar.gz
gentoo-2-4fd7ce389ffb87dd898b87b3ea8e2a5378bafb51.tar.bz2
gentoo-2-4fd7ce389ffb87dd898b87b3ea8e2a5378bafb51.zip
Apply -0.8.2-libnotify-0.7.patch also to current stable wrt #361093, Comment #2 by Thorsten Vollmer.
(Portage version: 2.2.0_alpha29/cvs/Linux x86_64)
Diffstat (limited to 'gnome-extra/nm-applet')
-rw-r--r--gnome-extra/nm-applet/ChangeLog7
-rw-r--r--gnome-extra/nm-applet/nm-applet-0.8.1-r2.ebuild4
-rw-r--r--gnome-extra/nm-applet/nm-applet-0.8.ebuild9
3 files changed, 16 insertions, 4 deletions
diff --git a/gnome-extra/nm-applet/ChangeLog b/gnome-extra/nm-applet/ChangeLog
index bdbdb2d32714..ea8a32702f83 100644
--- a/gnome-extra/nm-applet/ChangeLog
+++ b/gnome-extra/nm-applet/ChangeLog
@@ -1,6 +1,11 @@
# ChangeLog for gnome-extra/nm-applet
# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/nm-applet/ChangeLog,v 1.58 2011/02/05 12:20:10 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/nm-applet/ChangeLog,v 1.59 2011/03/29 14:15:18 ssuominen Exp $
+
+ 29 Mar 2011; Samuli Suominen <ssuominen@gentoo.org> nm-applet-0.8.ebuild,
+ nm-applet-0.8.1-r2.ebuild:
+ Apply -0.8.2-libnotify-0.7.patch also to current stable wrt #361093, Comment
+ #2 by Thorsten Vollmer.
05 Feb 2011; Samuli Suominen <ssuominen@gentoo.org> nm-applet-0.8.2.ebuild,
+files/nm-applet-0.8.2-libnotify-0.7.patch:
diff --git a/gnome-extra/nm-applet/nm-applet-0.8.1-r2.ebuild b/gnome-extra/nm-applet/nm-applet-0.8.1-r2.ebuild
index 2d76b5ff37d8..e380de826c6f 100644
--- a/gnome-extra/nm-applet/nm-applet-0.8.1-r2.ebuild
+++ b/gnome-extra/nm-applet/nm-applet-0.8.1-r2.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/nm-applet/nm-applet-0.8.1-r2.ebuild,v 1.4 2011/03/06 23:08:10 nirbheek Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/nm-applet/nm-applet-0.8.1-r2.ebuild,v 1.5 2011/03/29 14:15:18 ssuominen Exp $
EAPI="2"
@@ -48,6 +48,8 @@ src_prepare() {
epatch "${FILESDIR}/${P}-fix-compilation-with-DGSEAL_ENABLE.patch"
epatch "${FILESDIR}/${P}-fix-bluetooth-dep.patch"
+ epatch "${FILESDIR}"/${PN}-0.8.2-libnotify-0.7.patch
+
eautoreconf
}
diff --git a/gnome-extra/nm-applet/nm-applet-0.8.ebuild b/gnome-extra/nm-applet/nm-applet-0.8.ebuild
index f43f5e230742..0c50a7cab397 100644
--- a/gnome-extra/nm-applet/nm-applet-0.8.ebuild
+++ b/gnome-extra/nm-applet/nm-applet-0.8.ebuild
@@ -1,6 +1,6 @@
-# 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/gnome-extra/nm-applet/nm-applet-0.8.ebuild,v 1.7 2011/03/06 23:08:10 nirbheek Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/nm-applet/nm-applet-0.8.ebuild,v 1.8 2011/03/29 14:15:18 ssuominen Exp $
EAPI="2"
@@ -50,3 +50,8 @@ pkg_setup () {
--disable-more-warnings
--localstatedir=/var"
}
+
+src_prepare() {
+ epatch "${FILESDIR}"/${PN}-0.8.2-libnotify-0.7.patch
+ gnome2_src_prepare
+}