gnome-extra/alarm-clock-applet: Backport upstream patch for libnotify-0.7 compatibility

svn path=/sunrise/; revision=11808

4 files changed, 59 insertions, 5 deletions

diff --git a/gnome-extra/alarm-clock-applet/ChangeLog b/gnome-extra/alarm-clock-applet/ChangeLog
index 72dbb00b6..1b3a232bf 100644
--- a/gnome-extra/alarm-clock-applet/ChangeLog
+++ b/gnome-extra/alarm-clock-applet/ChangeLog
@@ -1,7 +1,12 @@
 # ChangeLog for gnome-extra/alarm-clock-applet
-# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
+# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+  12 Mar 2011; Alexandre Rostovtsev (tetromino) <tetromino@gmail.com>
+  -alarm-clock-applet-0.3.1.ebuild, +alarm-clock-applet-0.3.1-r1.ebuild,
+  +files/alarm-clock-applet-0.3.1-libnotify-0.7.patch:
+  Backport upstream patch for libnotify-0.7 compatibility
+
   18 Jun 2010; Fabiano Francesconi (elbryan) <fabiano.francesconi@gmail.com>
   -alarm-clock-applet-0.3.0.ebuild, +alarm-clock-applet-0.3.1.ebuild:
   Version bump
diff --git a/gnome-extra/alarm-clock-applet/Manifest b/gnome-extra/alarm-clock-applet/Manifest
index 4952371e8..7ca6866df 100644
--- a/gnome-extra/alarm-clock-applet/Manifest
+++ b/gnome-extra/alarm-clock-applet/Manifest
@@ -1,4 +1,5 @@
+AUX alarm-clock-applet-0.3.1-libnotify-0.7.patch 1542 RMD160 28923d71d79408ec43e1f0885262e9fbb83ec98b SHA1 22f7363d1eaa6bf5c30c538e45ad273965eb99bf SHA256 5263a1004369bb040b6348ea1c655053b865223fdf9929dd9abbdcee1e70a375
 DIST alarm-clock-applet-0.3.1.tar.gz 277067 RMD160 49588247e34eed749b34b289b2f0b856cabc6fe1 SHA1 b51d3f58b3b957801202e92b24c6545bce247fb5 SHA256 8e7c9c9a12ad2ab16bebd157f48af41b27f5202ab956ccbf924ec9d8843c3394
-EBUILD alarm-clock-applet-0.3.1.ebuild 639 RMD160 c2b16c6bb300e85abe36c0ef90a88b07c67abb8b SHA1 6e5f0f4d8aa435e07b5172e2242c961b11896c7d SHA256 6e2b1f4af51f1bb3de028aa965f66e8cd3bb7d5d49046e368a471496a3cf4317
-MISC ChangeLog 1210 RMD160 4eb0884475a62e7c4bde8bc69208db3ad07a773c SHA1 52d5edc6bfb454d022360d102fd1584869564777 SHA256 babadbbf56188282510652e55d2942a9a548d90a97a037d4e7682bdbfa8fdb49
+EBUILD alarm-clock-applet-0.3.1-r1.ebuild 755 RMD160 05af7d1e9f64b7899e51b9b86920346ea01e9e89 SHA1 f162ac0ae4a39415fbc3c19207b8f94c4bcc226a SHA256 e597b7f9c02ae813ac8059d86120605f62f0d368fea6dffadcca01b5fa138535
+MISC ChangeLog 1467 RMD160 ac5ea0f93977f98800fc566df042f2553166c2ec SHA1 a76dbc498d9045ca69f707f27be423be82ba7c97 SHA256 191d92bb80208edfe3d518844d05989abfdf44bcc2efdd449f9f61fdd54176e9
 MISC metadata.xml 229 RMD160 f0f6417bec31ce8baba6d476664f7210c8c84c98 SHA1 e5f94f5caadc6f843fc90bb7959570cd503676fd SHA256 3b08fca3c878bdfc4e7639f477dd542d55a4ab5dce39a475e82633071d13eb3f
diff --git a/gnome-extra/alarm-clock-applet/alarm-clock-applet-0.3.1.ebuild b/gnome-extra/alarm-clock-applet/alarm-clock-applet-0.3.1-r1.ebuild
index e2f29db4c..9ecff9eda 100644
--- a/gnome-extra/alarm-clock-applet/alarm-clock-applet-0.3.1.ebuild
+++ b/gnome-extra/alarm-clock-applet/alarm-clock-applet-0.3.1-r1.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2010 Gentoo Foundation
+# Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
 EAPI=2
 
-inherit gnome2
+inherit autotools eutils gnome2
 
 DESCRIPTION="A fully-featured alarm clock for your GNOME panel"
 HOMEPAGE="http://alarm-clock.pseudoberries.com/"
@@ -26,3 +26,9 @@ DEPEND="${RDEPEND}
 	dev-util/intltool
 	app-text/gnome-doc-utils
 	dev-util/pkgconfig"
+
+src_prepare() {
+	epatch "${FILESDIR}/${P}-libnotify-0.7.patch"
+	eautoreconf
+	gnome2_src_prepare
+}
diff --git a/gnome-extra/alarm-clock-applet/files/alarm-clock-applet-0.3.1-libnotify-0.7.patch b/gnome-extra/alarm-clock-applet/files/alarm-clock-applet-0.3.1-libnotify-0.7.patch
new file mode 100644
index 000000000..edd836fb6
--- /dev/null
+++ b/gnome-extra/alarm-clock-applet/files/alarm-clock-applet-0.3.1-libnotify-0.7.patch
@@ -0,0 +1,42 @@
+Backport upstream patch http://bazaar.launchpad.net/~joh/alarm-clock/trunk/revision/202
+to alarm-clock-applet-0.3.1
+
+diff -ru alarm-clock-applet-0.3.1-orig/configure.ac alarm-clock-applet-0.3.1/configure.ac
+--- alarm-clock-applet-0.3.1-orig/configure.ac	2010-05-16 14:19:20.000000000 -0400
++++ alarm-clock-applet-0.3.1/configure.ac	2011-03-12 01:12:29.877795697 -0500
+@@ -71,6 +71,16 @@
+ 
+ AM_GCONF_SOURCE_2
+ 
++#
++# Check for libnotify 0.7
++#
++PKG_CHECK_MODULES(LIBNOTIFY_0_7, libnotify >= 0.7, have_libnotify_0_7=yes, have_libnotify_0_7=no)
++
++if test x$have_libnotify_0_7 = xyes ; then
++    AC_DEFINE(HAVE_LIBNOTIFY_0_7, 1, [Have libnotify 0.7])
++fi
++AM_CONDITIONAL(HAVE_LIBNOTIFY_0_7, test x$have_libnotify_0_7 = xyes)
++
+ # ********************
+ # Internationalisation
+ # ********************
+diff -ru alarm-clock-applet-0.3.1-orig/src/ui.c alarm-clock-applet-0.3.1/src/ui.c
+--- alarm-clock-applet-0.3.1-orig/src/ui.c	2010-03-06 10:20:23.000000000 -0500
++++ alarm-clock-applet-0.3.1/src/ui.c	2011-03-12 01:16:53.538331261 -0500
+@@ -176,9 +176,14 @@
+     NotifyNotification *n;
+     GError *error = NULL;
+ 
++    // Gotta love API breakage...
++#ifdef HAVE_LIBNOTIFY_0_7
++    n = notify_notification_new (summary, body, icon);
++#else
+     n = notify_notification_new_with_status_icon (summary, body, icon,
+                                                   applet->status_icon);
+-    
++#endif
++
+     if (!notify_notification_show (n, &error)) {
+         g_warning ("Failed to send notification: %s", error->message);
+ 		g_error_free (error);