Switch to use libnotify07.

Bump PKGREVISION.

3 files changed, 49 insertions, 4 deletions

diff --git a/time/xfce4-orage/Makefile b/time/xfce4-orage/Makefile
index 93d1cd45cac..f6bbeb41bc1 100644
--- a/time/xfce4-orage/Makefile
+++ b/time/xfce4-orage/Makefile
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.25 2013/06/06 12:55:08 wiz Exp $
+# $NetBSD: Makefile,v 1.26 2013/08/16 08:14:31 obache Exp $
 
 .include "../../meta-pkgs/xfce4/Makefile.common"
 
 DISTNAME=	orage-${XFCE4_VERSION}
 PKGNAME=	xfce4-orage-${XFCE4_VERSION}
-PKGREVISION=	18
+PKGREVISION=	19
 CATEGORIES=	time
 COMMENT=	Xfce time managing application
 
@@ -13,7 +13,7 @@ CONFIGURE_ARGS+=	--disable-libxfce4mcs
 .include "../../graphics/hicolor-icon-theme/buildlink3.mk"
 .include "../../sysutils/dbus-glib/buildlink3.mk"
 .include "../../sysutils/desktop-file-utils/desktopdb.mk"
-.include "../../sysutils/libnotify/buildlink3.mk"
+.include "../../sysutils/libnotify07/buildlink3.mk"
 .include "../../x11/libxfce4gui/buildlink3.mk"
 .include "../../x11/xfce4-panel/buildlink3.mk"
 .include "../../mk/pthread.buildlink3.mk"
diff --git a/time/xfce4-orage/distinfo b/time/xfce4-orage/distinfo
index e45f9138b14..1d903761212 100644
--- a/time/xfce4-orage/distinfo
+++ b/time/xfce4-orage/distinfo
@@ -1,6 +1,7 @@
-$NetBSD: distinfo,v 1.5 2010/10/01 19:44:02 drochner Exp $
+$NetBSD: distinfo,v 1.6 2013/08/16 08:14:31 obache Exp $
 
 SHA1 (orage-4.6.1.tar.bz2) = 2db15404197ef9aa6f588c0eebac9fc4f68426df
 RMD160 (orage-4.6.1.tar.bz2) = 7724992e2e177487c71597a15d7faf7f865bb56b
 Size (orage-4.6.1.tar.bz2) = 1937593 bytes
 SHA1 (patch-aa) = 443913928b351028d34bdd07cb6cf60006f60e25
+SHA1 (patch-src_reminder.c) = 33267e51deb1ee1ec8e01155f9422f093c073175
diff --git a/time/xfce4-orage/patches/patch-src_reminder.c b/time/xfce4-orage/patches/patch-src_reminder.c
new file mode 100644
index 00000000000..19f13363153
--- /dev/null
+++ b/time/xfce4-orage/patches/patch-src_reminder.c
@@ -0,0 +1,44 @@
+$NetBSD: patch-src_reminder.c,v 1.1 2013/08/16 08:14:31 obache Exp $
+
+* for libnotify-0.7 API change
+  http://git.xfce.org/apps/orage/commit/src/reminder.c?id=bfa601ba135f84163eded2bb2e060e21d9ca08ce
+
+--- src/reminder.c.orig	2009-04-14 22:58:27.000000000 +0000
++++ src/reminder.c
+@@ -61,6 +61,12 @@
+ #define ORAGE_DEBUG 1
+ */
+ 
++/* Compatibility macro for < libnotify-0.7 */
++/* NOTIFY_CHECK_VERSION was created in 0.5.2 */
++#ifndef NOTIFY_CHECK_VERSION
++#deifne NOTIFY_CHECK_VERSION(x,y,z) 0
++#endif
++
+ static void create_notify_reminder(alarm_struct *alarm);
+ static void create_reminders(alarm_struct *alarm);
+ static void reset_orage_alarm_clock();
+@@ -425,8 +431,13 @@ static void create_notify_reminder(alarm
+     strncpy(heading,  _("Reminder "), 199);
+     if (alarm->title)
+         g_strlcat(heading, alarm->title, 50);
++    /* since version 0.7.0, libnotify does not have the widget parameter in
++       notify_notification_new and it does not have function
++       notify_notification_attach_to_status_icon at all */
++#if NOTIFY_CHECK_VERSION(0, 7, 0)
++    n = notify_notification_new(heading, alarm->description, NULL);
++#else
+     n = notify_notification_new(heading, alarm->description, NULL, NULL);
+-    alarm->active_alarm->active_notify = n;
+ #if GTK_CHECK_VERSION(2,10,0)
+     if (g_par.trayIcon 
+     && gtk_status_icon_is_embedded((GtkStatusIcon *)g_par.trayIcon))
+@@ -438,6 +449,8 @@ static void create_notify_reminder(alarm
+         notify_notification_attach_to_widget(n
+                 , ((XfceTrayIcon *)g_par.trayIcon)->image);
+ #endif
++#endif
++    alarm->active_alarm->active_notify = n;
+ 
+     if (alarm->notify_timeout == -1)
+         notify_notification_set_timeout(n, NOTIFY_EXPIRES_NEVER);