Fri Aug 16 05:53:02 2013 UTC ()
Switch to use libnotify07.

Bump PKGREVISION.


(obache)
diff -r1.51 -r1.52 pkgsrc/net/ekiga/Makefile
diff -r1.11 -r1.12 pkgsrc/net/ekiga/distinfo
diff -r1.2 -r1.3 pkgsrc/net/ekiga/options.mk
diff -r0 -r1.1 pkgsrc/net/ekiga/patches/patch-lib_engine_components_libnotify_libnotify-main.cpp
diff -r0 -r1.1 pkgsrc/net/ekiga/patches/patch-src_gui_main.cpp
cvs diff -r1.51 -r1.52 pkgsrc/net/ekiga/Attic/Makefile (expand / switch to unified diff)

--- pkgsrc/net/ekiga/Attic/Makefile 2013/06/06 12:54:54 1.51
+++ pkgsrc/net/ekiga/Attic/Makefile 2013/08/16 05:53:02 1.52
@@ -1,18 +1,18 @@ @@ -1,18 +1,18 @@
1# $NetBSD: Makefile,v 1.51 2013/06/06 12:54:54 wiz Exp $ 1# $NetBSD: Makefile,v 1.52 2013/08/16 05:53:02 obache Exp $
2# 2#
3 3
4DISTNAME= ekiga-3.2.6 4DISTNAME= ekiga-3.2.6
5PKGREVISION= 33 5PKGREVISION= 34
6CATEGORIES= net comms 6CATEGORIES= net comms
7MASTER_SITES= ${MASTER_SITE_GNOME:=sources/ekiga/3.2/} 7MASTER_SITES= ${MASTER_SITE_GNOME:=sources/ekiga/3.2/}
8EXTRACT_SUFX= .tar.bz2 8EXTRACT_SUFX= .tar.bz2
9 9
10MAINTAINER= pkgsrc-users@NetBSD.org 10MAINTAINER= pkgsrc-users@NetBSD.org
11HOMEPAGE= http://www.ekiga.org/ 11HOMEPAGE= http://www.ekiga.org/
12COMMENT= VoIP and video conferencing application for GNOME 12COMMENT= VoIP and video conferencing application for GNOME
13LICENSE= gnu-gpl-v2 13LICENSE= gnu-gpl-v2
14 14
15PREV_PKGPATH= net/ekiga-devel 15PREV_PKGPATH= net/ekiga-devel
16 16
17USE_TOOLS+= gmake intltool msgfmt pkg-config 17USE_TOOLS+= gmake intltool msgfmt pkg-config
18USE_PKGLOCALEDIR= yes 18USE_PKGLOCALEDIR= yes
cvs diff -r1.11 -r1.12 pkgsrc/net/ekiga/Attic/distinfo (expand / switch to unified diff)

--- pkgsrc/net/ekiga/Attic/distinfo 2013/03/28 21:34:51 1.11
+++ pkgsrc/net/ekiga/Attic/distinfo 2013/08/16 05:53:02 1.12
@@ -1,14 +1,16 @@ @@ -1,14 +1,16 @@
1$NetBSD: distinfo,v 1.11 2013/03/28 21:34:51 joerg Exp $ 1$NetBSD: distinfo,v 1.12 2013/08/16 05:53:02 obache Exp $
2 2
3SHA1 (ekiga-3.2.6.tar.bz2) = 1c9d2004aa57643a951c1d454e9cfb207143c021 3SHA1 (ekiga-3.2.6.tar.bz2) = 1c9d2004aa57643a951c1d454e9cfb207143c021
4RMD160 (ekiga-3.2.6.tar.bz2) = f53fe740856e4a4c5b6141086ba25288aabe51ac 4RMD160 (ekiga-3.2.6.tar.bz2) = f53fe740856e4a4c5b6141086ba25288aabe51ac
5Size (ekiga-3.2.6.tar.bz2) = 8257285 bytes 5Size (ekiga-3.2.6.tar.bz2) = 8257285 bytes
6SHA1 (patch-configure) = 2aa9145b6b790dcc4dbb63de47ebf663d059c26e 6SHA1 (patch-configure) = 2aa9145b6b790dcc4dbb63de47ebf663d059c26e
7SHA1 (patch-configure.ac) = a27f2712f9b3f2fa9020d85de87cae78d30ad9bb 7SHA1 (patch-configure.ac) = a27f2712f9b3f2fa9020d85de87cae78d30ad9bb
8SHA1 (patch-lib_engine_account_bank-impl.h) = 2cc4906ce966e5a8840ec5284433c3a9396c5911 8SHA1 (patch-lib_engine_account_bank-impl.h) = 2cc4906ce966e5a8840ec5284433c3a9396c5911
9SHA1 (patch-lib_engine_addressbook_book-impl.h) = 2259de4d6b4450180a0a2a60866eaf3f3e04f3eb 9SHA1 (patch-lib_engine_addressbook_book-impl.h) = 2259de4d6b4450180a0a2a60866eaf3f3e04f3eb
10SHA1 (patch-lib_engine_addressbook_source-impl.h) = ca0d25740c4b37768e15179e4980d4559cf392a8 10SHA1 (patch-lib_engine_addressbook_source-impl.h) = ca0d25740c4b37768e15179e4980d4559cf392a8
 11SHA1 (patch-lib_engine_components_libnotify_libnotify-main.cpp) = c7836b031dcb160003f9956fd968a0dd64ca1924
11SHA1 (patch-lib_engine_presence_cluster-impl.h) = bbdb345cbcb5eae14737021960434343b87bf5fe 12SHA1 (patch-lib_engine_presence_cluster-impl.h) = bbdb345cbcb5eae14737021960434343b87bf5fe
12SHA1 (patch-lib_engine_presence_heap-impl.h) = 7a28aa97722d3d81653a2eb98b9d92acc80a6f79 13SHA1 (patch-lib_engine_presence_heap-impl.h) = 7a28aa97722d3d81653a2eb98b9d92acc80a6f79
13SHA1 (patch-src_Makefile.am) = 54a6fd59b640c118b928af19fe3aa9943550a3dc 14SHA1 (patch-src_Makefile.am) = 54a6fd59b640c118b928af19fe3aa9943550a3dc
14SHA1 (patch-src_Makefile.in) = dab0e316da9ba7eb2286d104018d59dc85c1ed5b 15SHA1 (patch-src_Makefile.in) = dab0e316da9ba7eb2286d104018d59dc85c1ed5b
 16SHA1 (patch-src_gui_main.cpp) = fa15b3f8f2bf5e6bc1bdb73cb5376ae3a9858571
cvs diff -r1.2 -r1.3 pkgsrc/net/ekiga/Attic/options.mk (expand / switch to unified diff)

--- pkgsrc/net/ekiga/Attic/options.mk 2013/05/11 20:11:38 1.2
+++ pkgsrc/net/ekiga/Attic/options.mk 2013/08/16 05:53:02 1.3
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: options.mk,v 1.2 2013/05/11 20:11:38 riastradh Exp $ 1# $NetBSD: options.mk,v 1.3 2013/08/16 05:53:02 obache Exp $
2 2
3PKG_OPTIONS_VAR= PKG_OPTIONS.ekiga 3PKG_OPTIONS_VAR= PKG_OPTIONS.ekiga
4PKG_SUPPORTED_OPTIONS+= avahi dbus evolution-data-server gconf gnome notify 4PKG_SUPPORTED_OPTIONS+= avahi dbus evolution-data-server gconf gnome notify
5PKG_SUGGESTED_OPTIONS+= avahi dbus evolution-data-server gconf gnome notify 5PKG_SUGGESTED_OPTIONS+= avahi dbus evolution-data-server gconf gnome notify
6 6
7.include "../../mk/bsd.options.mk" 7.include "../../mk/bsd.options.mk"
8 8
9PLIST_VARS+= dbus gconf not-gconf 9PLIST_VARS+= dbus gconf not-gconf
10 10
11.if !empty(PKG_OPTIONS:Mavahi) 11.if !empty(PKG_OPTIONS:Mavahi)
12.include "../../net/avahi/buildlink3.mk" 12.include "../../net/avahi/buildlink3.mk"
13.else 13.else
14CONFIGURE_ARGS+= --disable-avahi 14CONFIGURE_ARGS+= --disable-avahi
@@ -40,17 +40,17 @@ PLIST.not-gconf= yes @@ -40,17 +40,17 @@ PLIST.not-gconf= yes
40CONFIGURE_ARGS+= --disable-gconf 40CONFIGURE_ARGS+= --disable-gconf
41.endif 41.endif
42 42
43.if !empty(PKG_OPTIONS:Mgnome) 43.if !empty(PKG_OPTIONS:Mgnome)
44CONFIGURE_ARGS+= --enable-gnome 44CONFIGURE_ARGS+= --enable-gnome
45.include "../../devel/libgnome/buildlink3.mk" 45.include "../../devel/libgnome/buildlink3.mk"
46.include "../../devel/libgnomeui/buildlink3.mk" 46.include "../../devel/libgnomeui/buildlink3.mk"
47.else 47.else
48CONFIGURE_ARGS+= --disable-gnome 48CONFIGURE_ARGS+= --disable-gnome
49.endif 49.endif
50 50
51.if !empty(PKG_OPTIONS:Mnotify) 51.if !empty(PKG_OPTIONS:Mnotify)
52CONFIGURE_ARGS+= --enable-notify 52CONFIGURE_ARGS+= --enable-notify
53.include "../../sysutils/libnotify/buildlink3.mk" 53.include "../../sysutils/libnotify07/buildlink3.mk"
54.else 54.else
55CONFIGURE_ARGS+= --disable-notify 55CONFIGURE_ARGS+= --disable-notify
56.endif 56.endif
File Added: pkgsrc/net/ekiga/patches/Attic/patch-lib_engine_components_libnotify_libnotify-main.cpp
$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 ());
File Added: pkgsrc/net/ekiga/patches/Attic/patch-src_gui_main.cpp
$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);
   }