Switch to use libnotify07.

Bump PKGREVISION.

6 files changed, 6 insertions, 57 deletions

diff --git a/chat/empathy/Makefile b/chat/empathy/Makefile
index f24eee7845c..623996b5736 100644
--- a/chat/empathy/Makefile
+++ b/chat/empathy/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.54 2013/06/06 12:53:57 wiz Exp $
+# $NetBSD: Makefile,v 1.55 2013/08/12 10:00:03 obache Exp $
 
 DISTNAME=	empathy-2.34.0
-PKGREVISION=	29
+PKGREVISION=	30
 CATEGORIES=	chat gnome
 MASTER_SITES=	${MASTER_SITE_GNOME:=sources/empathy/2.34/}
 
@@ -43,7 +43,7 @@ BUILDLINK_API_DEPENDS.enchant+=		enchant>=1.2.0
 .include "../../security/gnutls/buildlink3.mk"
 .include "../../sysutils/dbus/buildlink3.mk"
 .include "../../sysutils/desktop-file-utils/desktopdb.mk"
-.include "../../sysutils/libnotify/buildlink3.mk"
+.include "../../sysutils/libnotify07/buildlink3.mk"
 .include "../../textproc/enchant/buildlink3.mk"
 .include "../../textproc/gnome-doc-utils/buildlink3.mk"
 .include "../../textproc/gtk-doc/buildlink3.mk"
diff --git a/chat/empathy/distinfo b/chat/empathy/distinfo
index 45c10da42c5..575c2507cd6 100644
--- a/chat/empathy/distinfo
+++ b/chat/empathy/distinfo
@@ -1,12 +1,9 @@
-$NetBSD: distinfo,v 1.11 2013/05/04 22:38:14 prlw1 Exp $
+$NetBSD: distinfo,v 1.12 2013/08/12 10:00:03 obache Exp $
 
 SHA1 (empathy-2.34.0.tar.gz) = 533be910844e92e24be7232d2d122e9dc8b2267f
 RMD160 (empathy-2.34.0.tar.gz) = dfff9212f8c7f5d1c745a4b6bd3f6dbaf4ef02ab
 Size (empathy-2.34.0.tar.gz) = 5085101 bytes
-SHA1 (patch-aa) = ee11360640dcf6a4dd54339ddf63d1aca9d8a7ae
-SHA1 (patch-ab) = faab0ef087905b61eb676f5ae91df3f6ac4b06df
-SHA1 (patch-ac) = 0f99ad2c0498ad849ec3a3f6dcfe760d7e158a6c
-SHA1 (patch-ad) = 0df9f0f04447930e311913ab0e7fc13d5470cdf3
+SHA1 (patch-ad) = 2f0df78b7ee7ae3f58610894a6899397a4601ba7
 SHA1 (patch-libempathy_empathy-auth-factory.c) = 4f2e4fe7ad4e15bd075c39791248143a5c0f005f
 SHA1 (patch-src_Makefile.am) = b80be45492abf1a4bf79f4c408f07beb4ee4ed29
 SHA1 (patch-src_Makefile.in) = bf630e12c9517d0bb7b4e0e32ee47d4197ab0d92
diff --git a/chat/empathy/patches/patch-aa b/chat/empathy/patches/patch-aa
deleted file mode 100644
index 20bff09252d..00000000000
--- a/chat/empathy/patches/patch-aa
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-aa,v 1.4 2011/04/05 18:27:08 drochner Exp $
-
---- src/empathy-chat-window.c.orig	2011-03-24 15:15:16.000000000 +0000
-+++ src/empathy-chat-window.c
-@@ -1325,7 +1325,7 @@ chat_window_show_or_update_notification 
- 		   to an existing notification with the same title.
- 		   In this way the previous message will not be lost: the new
- 		   message will appear below it, in the same notification */
--		notification = notify_notification_new (header, escaped, NULL);
-+		notification = notify_notification_new (header, escaped, NULL, NULL);
- 
- 		if (priv->notification == NULL) {
- 			priv->notification = notification;
diff --git a/chat/empathy/patches/patch-ab b/chat/empathy/patches/patch-ab
deleted file mode 100644
index de1be1329d6..00000000000
--- a/chat/empathy/patches/patch-ab
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ab,v 1.1 2011/04/05 18:27:08 drochner Exp $
-
---- src/empathy-call-observer.c.orig	2011-03-24 15:15:16.000000000 +0000
-+++ src/empathy-call-observer.c
-@@ -135,7 +135,7 @@ get_contact_cb (TpConnection *connection
-       _("%s just tried to call you, but you were in another call."),
-       tp_contact_get_alias (contact));
- 
--  notification = notify_notification_new (summary, body, NULL);
-+  notification = notify_notification_new (summary, body, NULL, NULL);
- 
-   emp_contact = empathy_contact_dup_from_tp_contact (contact);
-   pixbuf = empathy_notify_manager_get_pixbuf_for_notification (
diff --git a/chat/empathy/patches/patch-ac b/chat/empathy/patches/patch-ac
deleted file mode 100644
index c175191f25d..00000000000
--- a/chat/empathy/patches/patch-ac
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ac,v 1.1 2011/04/05 18:27:08 drochner Exp $
-
---- src/empathy-status-icon.c.orig	2011-03-24 15:15:16.000000000 +0000
-+++ src/empathy-status-icon.c
-@@ -241,7 +241,7 @@ status_icon_update_notification (Empathy
- 			   In this way the previous message will not be lost: the new
- 			   message will appear below it, in the same notification */
- 			notification = notify_notification_new
--				(priv->event->header, message_esc, NULL);
-+				(priv->event->header, message_esc, NULL, NULL);
- 
- 			if (priv->notification == NULL) {
- 				priv->notification = notification;
diff --git a/chat/empathy/patches/patch-ad b/chat/empathy/patches/patch-ad
index fda922d24f1..5348b0213de 100644
--- a/chat/empathy/patches/patch-ad
+++ b/chat/empathy/patches/patch-ad
@@ -1,16 +1,7 @@
-$NetBSD: patch-ad,v 1.1 2011/04/05 18:27:08 drochner Exp $
+$NetBSD: patch-ad,v 1.2 2013/08/12 10:00:03 obache Exp $
 
 --- configure.orig	2011-03-24 15:18:52.000000000 +0000
 +++ configure
-@@ -2659,7 +2659,7 @@ GSTREAMER_REQUIRED=0.10.32
- GTK_REQUIRED=2.22.0
- KEYRING_REQUIRED=2.26.0
- LIBCANBERRA_GTK_REQUIRED=0.4
--LIBNOTIFY_REQUIRED=0.7.0
-+LIBNOTIFY_REQUIRED=0.4.0
- TELEPATHY_FARSIGHT_REQUIRED=0.0.14
- TELEPATHY_GLIB_REQUIRED=0.14.1
- TELEPATHY_LOGGER=0.2.0
 @@ -13553,8 +13553,8 @@ install-data-am: install-gsettings-schem
  .SECONDARY: $(gsettings_SCHEMAS)