From 494ea2a050aac74edce880e5f7acb849803e61fd Mon Sep 17 00:00:00 2001
From: obache <obache>
Date: Mon, 12 Aug 2013 12:52:16 +0000
Subject: Switch to use libnotify07.

Bump PKGREVISION.
---
 security/seahorse/Makefile                         |  6 ++--
 security/seahorse/distinfo                         |  3 +-
 .../patch-libseahorse_seahorse-notification.c      | 36 ++++++++++++++++++++++
 3 files changed, 41 insertions(+), 4 deletions(-)
 create mode 100644 security/seahorse/patches/patch-libseahorse_seahorse-notification.c

(limited to 'security')

diff --git a/security/seahorse/Makefile b/security/seahorse/Makefile
index 7102be2f2ea..2c813f76b7c 100644
--- a/security/seahorse/Makefile
+++ b/security/seahorse/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.115 2013/06/22 22:54:10 jperkin Exp $
+# $NetBSD: Makefile,v 1.116 2013/08/12 12:52:16 obache Exp $
 
 DISTNAME=	seahorse-2.32.0
-PKGREVISION=	21
+PKGREVISION=	22
 CATEGORIES=	security
 MASTER_SITES=	${MASTER_SITE_GNOME:=sources/seahorse/2.32/}
 EXTRACT_SUFX=	.tar.bz2
@@ -51,7 +51,7 @@ GCONF_SCHEMAS= 	seahorse.schemas
 BUILDLINK_API_DEPENDS.gpgme+=	gpgme>=1.0.1nb2
 .include "../../security/gpgme/buildlink3.mk"
 .include "../../sysutils/dbus-glib/buildlink3.mk"
-.include "../../sysutils/libnotify/buildlink3.mk"
+.include "../../sysutils/libnotify07/buildlink3.mk"
 .include "../../textproc/gnome-doc-utils/buildlink3.mk"
 .include "../../mk/omf-scrollkeeper.mk"
 .include "../../x11/gtk2/buildlink3.mk"
diff --git a/security/seahorse/distinfo b/security/seahorse/distinfo
index 61f7d7718fe..8b116a2ad3d 100644
--- a/security/seahorse/distinfo
+++ b/security/seahorse/distinfo
@@ -1,7 +1,8 @@
-$NetBSD: distinfo,v 1.35 2010/11/28 12:59:07 drochner Exp $
+$NetBSD: distinfo,v 1.36 2013/08/12 12:52:16 obache Exp $
 
 SHA1 (seahorse-2.32.0.tar.bz2) = 1469884b67483c876cfe5b986a76495739927a99
 RMD160 (seahorse-2.32.0.tar.bz2) = 5599cf02321be038d8aa5bc96174e2cf05c62945
 Size (seahorse-2.32.0.tar.bz2) = 2491230 bytes
 SHA1 (patch-ab) = 999c135e1815be5608caacb077dc9b881226dd30
 SHA1 (patch-ac) = 3df4e4950bc967c964746e55e3ca2fbffb0cddf2
+SHA1 (patch-libseahorse_seahorse-notification.c) = 05d1f2bc5c0de5e6a108ecf3a582589665e26faf
diff --git a/security/seahorse/patches/patch-libseahorse_seahorse-notification.c b/security/seahorse/patches/patch-libseahorse_seahorse-notification.c
new file mode 100644
index 00000000000..0f3a79c641a
--- /dev/null
+++ b/security/seahorse/patches/patch-libseahorse_seahorse-notification.c
@@ -0,0 +1,36 @@
+$NetBSD: patch-libseahorse_seahorse-notification.c,v 1.1 2013/08/12 12:52:16 obache Exp $
+
+* Fix build with libnotify 0.7
+  https://git.gnome.org/browse/seahorse/commit/?id=a6a21d1cc8f52f956e2f2bbab057ea301be18257
+  https://git.gnome.org/browse/seahorse/commit/?id=c548f3b610f1a925bcca0203b19200ef07a50d7a
+
+--- libseahorse/seahorse-notification.c.orig	2009-04-18 03:22:13.000000000 +0000
++++ libseahorse/seahorse-notification.c
+@@ -37,8 +37,14 @@
+ 
+ #ifdef HAVE_LIBNOTIFY
+ #include <libnotify/notify.h>
++
++#ifndef NOTIFY_CHECK_VERSION
++#define NOTIFY_CHECK_VERSION(x,y,z) 0
++#endif
++
+ #endif
+ 
++
+ /* -----------------------------------------------------------------------------
+  * SEAHORSE NOTIFICATION 
+  */
+@@ -231,7 +237,12 @@ setup_libnotify_notification (SeahorseNo
+     heading = format_key_text (snotif->heading);
+     message = format_key_text (snotif->message);
+     
++/* libnotify 0.7.0 and later has no support for attaching to widgets */
++#if NOTIFY_CHECK_VERSION(0,7,0)
++    notif = notify_notification_new (heading, message, snotif->icon);
++#else
+     notif = notify_notification_new (heading, message, snotif->icon, attachto);
++#endif
+     
+     g_free (heading);
+     g_free (message);
-- 
cgit v1.2.3