Fix build against libnotify-0.7.1

Package-Manager: portage-2.2.0_alpha26/cvs/Linux x86_64

5 files changed, 151 insertions, 10 deletions

diff --git a/gnome-extra/sensors-applet/ChangeLog b/gnome-extra/sensors-applet/ChangeLog
index 7215fe835b4f..f6398f8f0727 100644
--- a/gnome-extra/sensors-applet/ChangeLog
+++ b/gnome-extra/sensors-applet/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for gnome-extra/sensors-applet
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/sensors-applet/ChangeLog,v 1.49 2011/03/07 08:37:43 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/sensors-applet/ChangeLog,v 1.50 2011/03/07 09:22:31 jlec Exp $
+
+*sensors-applet-2.2.7-r1 (07 Mar 2011)
+
+  07 Mar 2011; Justin Lecher <jlec@gentoo.org> +sensors-applet-2.2.7-r1.ebuild,
+  +files/sensors-applet-2.2.7-libnotify-0.7.patch:
+  Fix build against libnotify-0.7.1
 
   07 Mar 2011; Justin Lecher <jlec@gentoo.org> sensors-applet-2.2.7.ebuild:
   Fails to build with x11-libs/libnotify-0.7.1, number of arguments for
diff --git a/gnome-extra/sensors-applet/Manifest b/gnome-extra/sensors-applet/Manifest
index c04bc624e9d1..f2d605b1dbde 100644
--- a/gnome-extra/sensors-applet/Manifest
+++ b/gnome-extra/sensors-applet/Manifest
@@ -3,16 +3,18 @@ Hash: SHA1
 
 AUX sensors-applet-1.7.12-test-fix.patch 540 RMD160 70ef1df3979ee72bb4232698335492e99aaed4bc SHA1 fe26c932a3b40e812e7eac184418fc72804fc297 SHA256 8cb8cb3781d26fddc5c11bff869328d237460d617e240a84ceb08f21bb6328e6
 AUX sensors-applet-2.2.2-nvidia-check.patch 951 RMD160 c9699308b389c31d848d6d2a55004a7a753caf87 SHA1 a25b9dfd69388fe051a19ae3b3c087c72d2c04ed SHA256 bfc7ecae661ff492f13c646e30659524e130dd34cbca74fe2d14f4d7bf9991c7
+AUX sensors-applet-2.2.7-libnotify-0.7.patch 3201 RMD160 3e20a50514d31ddd57ad43b3bee5caa5996fa4cb SHA1 14790a7158a7ac36f60f7367d2d5707f7d7f976d SHA256 fb32d1063c0efe06c291d13e810d49b0872c99b3194bb24b6857a0bd7c198c12
 DIST sensors-applet-2.2.4.tar.gz 464585 RMD160 740c9b5f0c4aa59aac3c307073a96d87ee08fa7e SHA1 60d93637c1970037ec7ce324070536e2aa754316 SHA256 a52214f2cf2b23a49394804dc589be51eecd4b8674f141047a46a550882f28f6
 DIST sensors-applet-2.2.7.tar.gz 484828 RMD160 1a800b7b9a228f51a26a10ae4c31ac0df5d2610a SHA1 82f5b9176f81aa7060b302d9f50b2a76564ad7b5 SHA256 368bae3baf983e192a0751f89d563ab9052c3ab2ab28bf62002a0d78d1ffcefe
 EBUILD sensors-applet-2.2.4.ebuild 1306 RMD160 cfa3dfb8fb63399cab91fc4d8b1b400141272d84 SHA1 c46b5b866e27d363f52396d00f80d9da61f0f7ec SHA256 88579d051154759298c1359d3c59657aa63141d597523d2d8f6c1dbafda444fc
+EBUILD sensors-applet-2.2.7-r1.ebuild 2006 RMD160 861ff4325768632a0210e4ccac2130d0aee97a37 SHA1 a9b154a912e23d1cc514f3457907bac8eba08b46 SHA256 7ebaa2fc984f9cad3037c6036f38bf474b829ff4e2a934c8655c6673314ca556
 EBUILD sensors-applet-2.2.7.ebuild 1917 RMD160 d8a72a45f411a242b2c606aa5bfe3c0db6d1f091 SHA1 c0ef970360390f5221b28a46031221425c3e30a7 SHA256 e1d6ea5523fc80f567702aefb1a8dbe38e84df72a33408671c70c816ae808590
-MISC ChangeLog 9444 RMD160 ffeec685ee2e7ad83900156ae9d87441c2e7f154 SHA1 fda8f3783830c3428578b4cf7744ddb26b52a44e SHA256 1b7432a2b6895cb7d43dadae37ccef1b93c093aac31e7f9af4f154e8d0e626eb
+MISC ChangeLog 9652 RMD160 195f9756cb9e6b7eb968e0660898732f0f14a766 SHA1 042252ecf3dc3146d7067d09a74650585581ec4e SHA256 3d7a2bf1c75597655dd33d8a50661e3b617f60a78b73e91527b45346514b39f4
 MISC metadata.xml 342 RMD160 e761b0d10437a107e4963ad475a49340cf830fc0 SHA1 518de70c94e013520807ee8606b03522f49c8d3a SHA256 8f31df57b084afbdabc6a63c0dba9d8f30d616bff61a7c49c1692a9cfc186fa0
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iEYEARECAAYFAk10mWQACgkQgAnW8HDreRYAugCeP/ouCwmEmZvnbvEV+1SVW8Nq
-u1cAoI+IvJXJXEUh7d74XTVB6DgLmgPr
-=qL+3
+iEYEARECAAYFAk10o+IACgkQgAnW8HDreRbSFACfYq2bw2h3F6ZINVWvTkn0vkyi
+ud8An2+tbhg/zqAq1NTQgasWr9ZclzZX
+=IoAw
 -----END PGP SIGNATURE-----
diff --git a/gnome-extra/sensors-applet/files/sensors-applet-2.2.7-libnotify-0.7.patch b/gnome-extra/sensors-applet/files/sensors-applet-2.2.7-libnotify-0.7.patch
new file mode 100644
index 000000000000..ea2f7803a8fa
--- /dev/null
+++ b/gnome-extra/sensors-applet/files/sensors-applet-2.2.7-libnotify-0.7.patch
@@ -0,0 +1,57 @@
+diff --git a/sensors-applet/active-sensor-libnotify.c b/sensors-applet/active-sensor-libnotify.c
+index e69b005..f7a7eb8 100644
+--- a/sensors-applet/active-sensor-libnotify.c
++++ b/sensors-applet/active-sensor-libnotify.c
+@@ -84,10 +84,23 @@ void active_sensor_libnotify_notify(ActiveSensor *active_sensor,
+ 
+         /* now create a new one */
+         g_debug("Creating new notification");
++        #ifdef NOTIFY_CHECK_VERSION
++        #if NOTIFY_CHECK_VERSION (0, 7, 1)
++        active_sensor->notification[notif_type] = notify_notification_new(summary,
++                                                                          message,
++                                                                          icon_filename);
++        #else
++        active_sensor->notification[notif_type] = notify_notification_new(summary,
++                                                                          message,
++                                                                          icon_filename,
++                                                                          attach);
++        #endif
++        #else
+         active_sensor->notification[notif_type] = notify_notification_new(summary,
+                                                                           message,
+                                                                           icon_filename,
+                                                                           attach);
++        #endif
+         g_signal_connect(active_sensor->notification[notif_type], "closed",
+                          G_CALLBACK(notif_closed_cb),
+                          active_sensor);
+diff --git a/sensors-applet/sensors-applet.c b/sensors-applet/sensors-applet.c
+index 9486173..81675b8 100644
+--- a/sensors-applet/sensors-applet.c
++++ b/sensors-applet/sensors-applet.c
+@@ -303,11 +303,23 @@ void sensors_applet_notify(SensorsApplet *sensors_applet,
+                 message = g_strdup_printf(_("An error occurred while trying to save the current sensor configuration. "));
+                 break;
+         }
+-        
++        #ifdef NOTIFY_CHECK_VERSION
++        #if NOTIFY_CHECK_VERSION (0, 7, 1)
++        sensors_applet->notification = notify_notification_new(summary,
++                                                               message,
++                                                               GTK_STOCK_DIALOG_WARNING);
++        #else
++        sensors_applet->notification = notify_notification_new(summary,
++                                                               message,
++                                                               GTK_STOCK_DIALOG_WARNING,
++                                                               GTK_WIDGET(sensors_applet->applet));
++        #endif
++        #else
+         sensors_applet->notification = notify_notification_new(summary,
+                                                                message,
+                                                                GTK_STOCK_DIALOG_WARNING,
+                                                                GTK_WIDGET(sensors_applet->applet));
++        #endif
+         g_free(summary);
+         g_free(message);
+         
diff --git a/gnome-extra/sensors-applet/sensors-applet-2.2.7-r1.ebuild b/gnome-extra/sensors-applet/sensors-applet-2.2.7-r1.ebuild
new file mode 100644
index 000000000000..7acce06bdf93
--- /dev/null
+++ b/gnome-extra/sensors-applet/sensors-applet-2.2.7-r1.ebuild
@@ -0,0 +1,76 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/sensors-applet/sensors-applet-2.2.7-r1.ebuild,v 1.1 2011/03/07 09:22:31 jlec Exp $
+
+EAPI="2"
+GCONF_DEBUG="no"
+
+inherit eutils gnome2
+
+DESCRIPTION="GNOME panel applet to display readings from hardware sensors"
+HOMEPAGE="http://sensors-applet.sourceforge.net/"
+SRC_URI="mirror://sourceforge/sensors-applet/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~ppc ~x86"
+IUSE="+dbus hddtemp libnotify lm_sensors video_cards_fglrx video_cards_nvidia"
+
+RDEPEND="
+	>=dev-libs/glib-2.14
+	>=x11-libs/gtk+-2.14
+	|| ( gnome-base/gnome-panel[bonobo] <gnome-base/gnome-panel-2.32 )
+	>=gnome-base/libgnome-2.8
+	>=gnome-base/libgnomeui-2.8
+	>=x11-libs/cairo-1.0.4
+	hddtemp? (
+		dbus? (
+			>=dev-libs/dbus-glib-0.80
+			>=dev-libs/libatasmart-0.16 )
+		!dbus? ( >=app-admin/hddtemp-0.3_beta13 ) )
+	libnotify? ( x11-libs/libnotify )
+	lm_sensors? ( sys-apps/lm_sensors )
+	video_cards_fglrx? ( x11-drivers/ati-drivers )
+	video_cards_nvidia? ( || (
+		>=x11-drivers/nvidia-drivers-100.14.09
+		media-video/nvidia-settings
+	) )"
+
+DEPEND="${RDEPEND}
+	>=dev-util/pkgconfig-0.12
+	>=app-text/scrollkeeper-0.3.14
+	>=app-text/gnome-doc-utils-0.3.2
+	dev-util/intltool"
+# Requires libxslt only for use by gnome-doc-utils
+
+PDEPEND="hddtemp? ( dbus? ( sys-fs/udisks ) )"
+
+DOCS="AUTHORS ChangeLog NEWS README TODO"
+
+pkg_setup() {
+	G2CONF="${G2CONF}
+		--disable-scrollkeeper
+		--disable-static
+		$(use_enable dbus udisks)
+		$(use_enable libnotify)
+		$(use_with lm_sensors libsensors)
+		$(use_with video_cards_fglrx aticonfig)
+		$(use_with video_cards_nvidia nvidia)"
+
+	if use hddtemp; then
+		G2CONF="${G2CONF} $(use_enable dbus udisks)"
+	else
+		G2CONF="${G2CONF} --disable-udisks"
+	fi
+}
+
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-libnotify-0.7.patch
+	gnome2_src_prepare
+}
+
+src_install() {
+	gnome2_src_install
+
+	find "${D}" -name "*.la" -delete || die "failed to delete *.la"
+}
diff --git a/gnome-extra/zenity/Manifest b/gnome-extra/zenity/Manifest
index c6963f16dfe3..7d0bf0de629d 100644
--- a/gnome-extra/zenity/Manifest
+++ b/gnome-extra/zenity/Manifest
@@ -5,13 +5,13 @@ AUX zenity-2.32.1-libnotify-0.7.patch 746 RMD160 cd2eed097c232a5c4c84da574a8a2aa
 DIST zenity-2.30.0.tar.bz2 3095111 RMD160 aa5e482a669fc317e5e0a561f855accdc2c6a173 SHA1 a55b0c7e251cdf835dd03b545aa7c96f7ef02384 SHA256 d42a9be6f77eb018fb8c5967094db86604271f342dd15b6e6101338d82f923ff
 DIST zenity-2.32.1.tar.bz2 3128666 RMD160 30b19230d9e1ed478cfd17d2a6942863bcda6763 SHA1 5e75e9200768ecf9eb7f1e6edac7a395ddb47947 SHA256 8838be041a07364b62a4281c971392e4a09bb01bb3237a836ec0457ec0ea18ac
 EBUILD zenity-2.30.0.ebuild 1297 RMD160 6a0197e14600accfc4e6207b3323e3d613838263 SHA1 b08073f11a097d6f482e08e9b5134838f22b2676 SHA256 e229ebe9ef464489d91c1d9042fd129768cf372935fadd95e5be003b3280306c
-EBUILD zenity-2.32.1.ebuild 1277 RMD160 0159c19277ed0a88a3689e8af72fd01a8652ca74 SHA1 f0ee98484022195fd326f71b5d4efc514e1e23b4 SHA256 ece94604d18a6f4e61f715977dc44f11535bade46048c8d6421cf28f37d89a31
-MISC ChangeLog 22799 RMD160 ae39698aee895e359cf0e0e45cee4feda15a20e1 SHA1 7969bd0c7e1599c81cf75a3369c3e7af0e4c6155 SHA256 9966da9fa8cd862ed762900efef2370c9071cf7c135e608569272a7f485f49b1
+EBUILD zenity-2.32.1.ebuild 1309 RMD160 ecb44b0b476364597c114df1586bf2ce3829d3b6 SHA1 0ed36f9c5d5c77ad71f4c22bedc942114954fd89 SHA256 ccd26bf8e9e810947ba0420ed2b9b7a8abdaeefb23718e26d31171f0f7fcaa44
+MISC ChangeLog 22946 RMD160 5fabd877871a8ef8d3d80c59ccb7e1321cbf60bd SHA1 b6b4290fd4d5eba3ab0529f0a1af96a1b5a71f50 SHA256 8e4d833b8cba572be60dcc331de0bfbf2d10291b44a7bcb331d3256326fe5ea8
 MISC metadata.xml 302 RMD160 bde33bbd14d8085f9c4a63abf344904951e87f2f SHA1 421c8f95533baed57a7b116cce8b6b7a8121a4ff SHA256 b52e3b6c6080efd1fedb03fe6136d89d74f1e58896ae8d6f075622bf6806e200
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iEYEARECAAYFAk1mwJ0ACgkQnZsgo/h8kNb2WACfSu12snVe/RvuRUbvQyYUwqxB
-jWEAoIl3X6V0IUY/LATKU2KFZoSJ6wqL
-=BvYm
+iEYEARECAAYFAk10pO0ACgkQCaWpQKGI+9TihwCfeO4E07ddVY0iX6dVKx04xhQC
+oNMAn1xLcATUfH5Uw+LJuPYF6UcjW8uY
+=w23N
 -----END PGP SIGNATURE-----