diff options
| author | obache <obache> | 2013-08-14 08:30:06 +0000 |
|---|---|---|
| committer | obache <obache> | 2013-08-14 08:30:06 +0000 |
| commit | 6c675c6d1e911cfdd9765505264140e55e90b82a (patch) | |
| tree | c0685ebb7cb9a1d80dbc4edec635debdb40b5fbb | |
| parent | f85a7e635d8dc429f9a86175ee54d3781359cebf (diff) | |
| download | pkgsrc-6c675c6d1e911cfdd9765505264140e55e90b82a.tar.gz | |
Switch to use libnotify07.
Bump PKGREVISION.
| -rw-r--r-- | security/seahorse-plugins/Makefile | 6 | ||||
| -rw-r--r-- | security/seahorse-plugins/distinfo | 3 | ||||
| -rw-r--r-- | security/seahorse-plugins/patches/patch-libseahorse_seahorse-notification.c | 32 |
3 files changed, 37 insertions, 4 deletions
diff --git a/security/seahorse-plugins/Makefile b/security/seahorse-plugins/Makefile index 135200bf96f..4ef658aacce 100644 --- a/security/seahorse-plugins/Makefile +++ b/security/seahorse-plugins/Makefile @@ -1,7 +1,7 @@ -# $NetBSD: Makefile,v 1.44 2013/06/06 12:55:02 wiz Exp $ +# $NetBSD: Makefile,v 1.45 2013/08/14 08:30:06 obache Exp $ DISTNAME= seahorse-plugins-2.30.1 -PKGREVISION= 27 +PKGREVISION= 28 CATEGORIES= security MASTER_SITES= ${MASTER_SITE_GNOME:=sources/seahorse-plugins/2.30/} EXTRACT_SUFX= .tar.bz2 @@ -31,7 +31,7 @@ GCONF_SCHEMAS+= seahorse-plugins.schemas .include "../../security/gnome-keyring/buildlink3.mk" .include "../../sysutils/dbus-glib/buildlink3.mk" .include "../../sysutils/desktop-file-utils/desktopdb.mk" -.include "../../sysutils/libnotify/buildlink3.mk" +.include "../../sysutils/libnotify07/buildlink3.mk" .include "../../sysutils/nautilus/buildlink3.mk" .include "../../textproc/gnome-doc-utils/buildlink3.mk" # doesn't suffice, configure says: diff --git a/security/seahorse-plugins/distinfo b/security/seahorse-plugins/distinfo index 3eee9ebe805..06ac4a1bf14 100644 --- a/security/seahorse-plugins/distinfo +++ b/security/seahorse-plugins/distinfo @@ -1,5 +1,6 @@ -$NetBSD: distinfo,v 1.7 2010/11/29 12:56:20 drochner Exp $ +$NetBSD: distinfo,v 1.8 2013/08/14 08:30:06 obache Exp $ SHA1 (seahorse-plugins-2.30.1.tar.bz2) = d06c638e839024ab623dc001b3c4e43be293ede8 RMD160 (seahorse-plugins-2.30.1.tar.bz2) = a493ccad1d25c7c112f33c30d141a241eaf71048 Size (seahorse-plugins-2.30.1.tar.bz2) = 1304864 bytes +SHA1 (patch-libseahorse_seahorse-notification.c) = ca0a053531f87bcca93a0c8fc9b18494ac10dbf1 diff --git a/security/seahorse-plugins/patches/patch-libseahorse_seahorse-notification.c b/security/seahorse-plugins/patches/patch-libseahorse_seahorse-notification.c new file mode 100644 index 00000000000..17fcb5da5dd --- /dev/null +++ b/security/seahorse-plugins/patches/patch-libseahorse_seahorse-notification.c @@ -0,0 +1,32 @@ +$NetBSD: patch-libseahorse_seahorse-notification.c,v 1.1 2013/08/14 08:30:06 obache Exp $ + +* fix build with libnotify-0.7 + https://git.gnome.org/browse/seahorse-plugins/commit/?id=fb74a75aa237c97c90dc1df2cfe36656a320e93e&ignorews=1 + +--- libseahorse/seahorse-notification.c.orig 2010-02-13 14:36:31.000000000 +0000 ++++ libseahorse/seahorse-notification.c +@@ -34,6 +34,11 @@ + + #ifdef HAVE_LIBNOTIFY + #include <libnotify/notify.h> ++ ++#ifndef NOTIFY_CHECK_VERSION ++#define NOTIFY_CHECK_VERSION(x,y,z) 0 ++#endif ++ + #endif + + /* ----------------------------------------------------------------------------- +@@ -213,7 +218,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); |