Switch to use libnotify07.

Bump PKGREVISION.

5 files changed, 42 insertions, 5 deletions

diff --git a/net/ekiga/Makefile b/net/ekiga/Makefile
index 79ca22641cd..af64cac8ddc 100644
--- a/net/ekiga/Makefile
+++ b/net/ekiga/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.51 2013/06/06 12:54:54 wiz Exp $
+# $NetBSD: Makefile,v 1.52 2013/08/16 05:53:02 obache Exp $
 #
 
 DISTNAME=		ekiga-3.2.6
-PKGREVISION=		33
+PKGREVISION=		34
 CATEGORIES=		net comms
 MASTER_SITES=		${MASTER_SITE_GNOME:=sources/ekiga/3.2/}
 EXTRACT_SUFX=		.tar.bz2
diff --git a/net/ekiga/distinfo b/net/ekiga/distinfo
index 70361bde600..fd49b3ae5c2 100644
--- a/net/ekiga/distinfo
+++ b/net/ekiga/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.11 2013/03/28 21:34:51 joerg Exp $
+$NetBSD: distinfo,v 1.12 2013/08/16 05:53:02 obache Exp $
 
 SHA1 (ekiga-3.2.6.tar.bz2) = 1c9d2004aa57643a951c1d454e9cfb207143c021
 RMD160 (ekiga-3.2.6.tar.bz2) = f53fe740856e4a4c5b6141086ba25288aabe51ac
@@ -8,7 +8,9 @@ SHA1 (patch-configure.ac) = a27f2712f9b3f2fa9020d85de87cae78d30ad9bb
 SHA1 (patch-lib_engine_account_bank-impl.h) = 2cc4906ce966e5a8840ec5284433c3a9396c5911
 SHA1 (patch-lib_engine_addressbook_book-impl.h) = 2259de4d6b4450180a0a2a60866eaf3f3e04f3eb
 SHA1 (patch-lib_engine_addressbook_source-impl.h) = ca0d25740c4b37768e15179e4980d4559cf392a8
+SHA1 (patch-lib_engine_components_libnotify_libnotify-main.cpp) = c7836b031dcb160003f9956fd968a0dd64ca1924
 SHA1 (patch-lib_engine_presence_cluster-impl.h) = bbdb345cbcb5eae14737021960434343b87bf5fe
 SHA1 (patch-lib_engine_presence_heap-impl.h) = 7a28aa97722d3d81653a2eb98b9d92acc80a6f79
 SHA1 (patch-src_Makefile.am) = 54a6fd59b640c118b928af19fe3aa9943550a3dc
 SHA1 (patch-src_Makefile.in) = dab0e316da9ba7eb2286d104018d59dc85c1ed5b
+SHA1 (patch-src_gui_main.cpp) = fa15b3f8f2bf5e6bc1bdb73cb5376ae3a9858571
diff --git a/net/ekiga/options.mk b/net/ekiga/options.mk
index be6ca56680b..1f46487b08b 100644
--- a/net/ekiga/options.mk
+++ b/net/ekiga/options.mk
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.2 2013/05/11 20:11:38 riastradh Exp $
+# $NetBSD: options.mk,v 1.3 2013/08/16 05:53:02 obache Exp $
 
 PKG_OPTIONS_VAR=	PKG_OPTIONS.ekiga
 PKG_SUPPORTED_OPTIONS+= avahi dbus evolution-data-server gconf gnome notify
@@ -50,7 +50,7 @@ CONFIGURE_ARGS+=	--disable-gnome
 
 .if !empty(PKG_OPTIONS:Mnotify)
 CONFIGURE_ARGS+=	--enable-notify
-.include "../../sysutils/libnotify/buildlink3.mk"
+.include "../../sysutils/libnotify07/buildlink3.mk"
 .else
 CONFIGURE_ARGS+=	--disable-notify
 .endif
diff --git a/net/ekiga/patches/patch-lib_engine_components_libnotify_libnotify-main.cpp b/net/ekiga/patches/patch-lib_engine_components_libnotify_libnotify-main.cpp
new file mode 100644
index 00000000000..e80d27ade63
--- /dev/null
+++ b/net/ekiga/patches/patch-lib_engine_components_libnotify_libnotify-main.cpp
@@ -0,0 +1,15 @@
+$NetBSD: patch-lib_engine_components_libnotify_libnotify-main.cpp,v 1.1 2013/08/16 05:53:02 obache Exp $
+
+* for linbotify-0.7 API change
+
+--- lib/engine/components/libnotify/libnotify-main.cpp.orig	2009-09-22 14:27:35.000000000 +0000
++++ lib/engine/components/libnotify/libnotify-main.cpp
+@@ -158,7 +158,7 @@ LibNotify::on_notification_added (gmref_
+ 
+   notif = notify_notification_new (notification->get_title ().c_str (),
+ 				   notification->get_body ().c_str (),
+-				   urgency, NULL);
++				   urgency);
+ 
+   g_signal_connect (notif, "closed",
+ 		    G_CALLBACK (on_notif_closed), notification.get ());
diff --git a/net/ekiga/patches/patch-src_gui_main.cpp b/net/ekiga/patches/patch-src_gui_main.cpp
new file mode 100644
index 00000000000..cd89e462e24
--- /dev/null
+++ b/net/ekiga/patches/patch-src_gui_main.cpp
@@ -0,0 +1,20 @@
+$NetBSD: patch-src_gui_main.cpp,v 1.1 2013/08/16 05:53:02 obache Exp $
+
+* for libnotify-0.7 API change
+
+--- src/gui/main.cpp.orig	2009-09-22 14:27:35.000000000 +0000
++++ src/gui/main.cpp
+@@ -2807,12 +2807,11 @@ ekiga_main_window_incoming_call_notify (
+ 
+   body = g_strdup_printf ("%s\n%s\n%s", uri, app, account);
+   
+-  notify = notify_notification_new (title, body, GM_ICON_LOGO, NULL);
++  notify = notify_notification_new (title, body, GM_ICON_LOGO);
+   notify_notification_add_action (notify, "accept", _("Accept"), notify_action_cb, mw, NULL);
+   notify_notification_add_action (notify, "reject", _("Reject"), notify_action_cb, mw, NULL);
+   notify_notification_set_timeout (notify, NOTIFY_EXPIRES_NEVER);
+   notify_notification_set_urgency (notify, NOTIFY_URGENCY_CRITICAL);
+-  notify_notification_attach_to_status_icon (notify, statusicon);
+   if (!notify_notification_show (notify, NULL)) {
+     ekiga_main_window_incoming_call_dialog_show (mw, call);
+   }