Fri Aug 16 08:14:31 2013 UTC ()
Switch to use libnotify07.

Bump PKGREVISION.


(obache)
diff -r1.25 -r1.26 pkgsrc/time/xfce4-orage/Makefile
diff -r1.5 -r1.6 pkgsrc/time/xfce4-orage/distinfo
diff -r0 -r1.1 pkgsrc/time/xfce4-orage/patches/patch-src_reminder.c
cvs diff -r1.25 -r1.26 pkgsrc/time/xfce4-orage/Makefile (expand / switch to unified diff)

--- pkgsrc/time/xfce4-orage/Makefile 2013/06/06 12:55:08 1.25
+++ pkgsrc/time/xfce4-orage/Makefile 2013/08/16 08:14:31 1.26
@@ -1,20 +1,20 @@ @@ -1,20 +1,20 @@
1# $NetBSD: Makefile,v 1.25 2013/06/06 12:55:08 wiz Exp $ 1# $NetBSD: Makefile,v 1.26 2013/08/16 08:14:31 obache Exp $
2 2
3.include "../../meta-pkgs/xfce4/Makefile.common" 3.include "../../meta-pkgs/xfce4/Makefile.common"
4 4
5DISTNAME= orage-${XFCE4_VERSION} 5DISTNAME= orage-${XFCE4_VERSION}
6PKGNAME= xfce4-orage-${XFCE4_VERSION} 6PKGNAME= xfce4-orage-${XFCE4_VERSION}
7PKGREVISION= 18 7PKGREVISION= 19
8CATEGORIES= time 8CATEGORIES= time
9COMMENT= Xfce time managing application 9COMMENT= Xfce time managing application
10 10
11CONFIGURE_ARGS+= --disable-libxfce4mcs 11CONFIGURE_ARGS+= --disable-libxfce4mcs
12 12
13.include "../../graphics/hicolor-icon-theme/buildlink3.mk" 13.include "../../graphics/hicolor-icon-theme/buildlink3.mk"
14.include "../../sysutils/dbus-glib/buildlink3.mk" 14.include "../../sysutils/dbus-glib/buildlink3.mk"
15.include "../../sysutils/desktop-file-utils/desktopdb.mk" 15.include "../../sysutils/desktop-file-utils/desktopdb.mk"
16.include "../../sysutils/libnotify/buildlink3.mk" 16.include "../../sysutils/libnotify07/buildlink3.mk"
17.include "../../x11/libxfce4gui/buildlink3.mk" 17.include "../../x11/libxfce4gui/buildlink3.mk"
18.include "../../x11/xfce4-panel/buildlink3.mk" 18.include "../../x11/xfce4-panel/buildlink3.mk"
19.include "../../mk/pthread.buildlink3.mk" 19.include "../../mk/pthread.buildlink3.mk"
20.include "../../mk/bsd.pkg.mk" 20.include "../../mk/bsd.pkg.mk"
cvs diff -r1.5 -r1.6 pkgsrc/time/xfce4-orage/distinfo (expand / switch to unified diff)

--- pkgsrc/time/xfce4-orage/distinfo 2010/10/01 19:44:02 1.5
+++ pkgsrc/time/xfce4-orage/distinfo 2013/08/16 08:14:31 1.6
@@ -1,6 +1,7 @@ @@ -1,6 +1,7 @@
1$NetBSD: distinfo,v 1.5 2010/10/01 19:44:02 drochner Exp $ 1$NetBSD: distinfo,v 1.6 2013/08/16 08:14:31 obache Exp $
2 2
3SHA1 (orage-4.6.1.tar.bz2) = 2db15404197ef9aa6f588c0eebac9fc4f68426df 3SHA1 (orage-4.6.1.tar.bz2) = 2db15404197ef9aa6f588c0eebac9fc4f68426df
4RMD160 (orage-4.6.1.tar.bz2) = 7724992e2e177487c71597a15d7faf7f865bb56b 4RMD160 (orage-4.6.1.tar.bz2) = 7724992e2e177487c71597a15d7faf7f865bb56b
5Size (orage-4.6.1.tar.bz2) = 1937593 bytes 5Size (orage-4.6.1.tar.bz2) = 1937593 bytes
6SHA1 (patch-aa) = 443913928b351028d34bdd07cb6cf60006f60e25 6SHA1 (patch-aa) = 443913928b351028d34bdd07cb6cf60006f60e25
 7SHA1 (patch-src_reminder.c) = 33267e51deb1ee1ec8e01155f9422f093c073175
File Added: pkgsrc/time/xfce4-orage/patches/Attic/patch-src_reminder.c
$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);