From 4bda1c3db11ed2323ab8b55d2088972fcdfc734a Mon Sep 17 00:00:00 2001
From: ajacoutot <ajacoutot@openbsd.org>
Date: Thu, 27 Sep 2012 09:30:49 +0000
Subject: [PATCH] Update to gcr-3.6.0.

---
 x11/gnome/gcr/Makefile  | 24 ++++++++++++------------
 x11/gnome/gcr/distinfo  |  4 ++--
 x11/gnome/gcr/pkg/PLIST |  3 ++-
 3 files changed, 16 insertions(+), 15 deletions(-)

diff --git a/x11/gnome/gcr/Makefile b/x11/gnome/gcr/Makefile
index 1681cb1810d..55a95b3173a 100644
--- a/x11/gnome/gcr/Makefile
+++ b/x11/gnome/gcr/Makefile
@@ -1,14 +1,13 @@
-# $OpenBSD: Makefile,v 1.6 2012/09/01 14:36:59 ajacoutot Exp $
+# $OpenBSD: Makefile,v 1.7 2012/09/27 09:30:49 ajacoutot Exp $
 
 COMMENT=	library for bits of crypto UI and parsing
 
 GNOME_PROJECT=	gcr
-GNOME_VERSION=	3.4.1
-REVISION=	1
+GNOME_VERSION=	3.6.0
 
 SHARED_LIBS +=  gck-1                     1.0 # 0.0
 SHARED_LIBS +=  gcr-3                     2.0 # 1.0
-SHARED_LIBS +=  gcr-base-3                0.0 # 1.0
+SHARED_LIBS +=  gcr-base-3                1.0 # 1.0
 
 # LGPLv2
 PERMIT_PACKAGE_CDROM=	Yes
@@ -16,13 +15,14 @@ PERMIT_PACKAGE_FTP=	Yes
 PERMIT_DISTFILES_CDROM=	Yes
 PERMIT_DISTFILES_FTP=	Yes
 
-WANTLIB += GL X11 Xcomposite Xcursor Xdamage Xext Xfixes Xi Xinerama
-WANTLIB += Xrandr Xrender atk-1.0 c cairo cairo-gobject expat
-WANTLIB += ffi fontconfig freetype gcrypt gdk-3 gdk_pixbuf-2.0
-WANTLIB += gio-2.0 glib-2.0 gmodule-2.0 gobject-2.0 gpg-error
-WANTLIB += gthread-2.0 gtk-3 m p11-kit pango-1.0 pangocairo-1.0
-WANTLIB += pangoft2-1.0 pcre pixman-1 png pthread pthread-stubs
-WANTLIB += xcb xcb-render xcb-shm z
+WANTLIB += GL ICE SM X11 Xcomposite Xcursor Xdamage Xext Xfixes
+WANTLIB += Xi Xinerama Xrandr Xrender atk-1.0 atk-bridge-2.0 atspi
+WANTLIB += c cairo cairo-gobject dbus-1 expat ffi fontconfig freetype
+WANTLIB += gcrypt gdk-3 gdk_pixbuf-2.0 gio-2.0 glib-2.0 gmodule-2.0
+WANTLIB += gobject-2.0 gpg-error gthread-2.0 gtk-3 harfbuzz icudata
+WANTLIB += icule icuuc m p11-kit pango-1.0 pangocairo-1.0 pangoft2-1.0
+WANTLIB += pcre pixman-1 png pthread pthread-stubs xcb xcb-render
+WANTLIB += xcb-shm z
 
 MODULES=	devel/gettext \
 		x11/gnome \
@@ -44,7 +44,7 @@ RUN_DEPENDS=	misc/shared-mime-info
 
 LIB_DEPENDS=	x11/gtk+3 \
 		security/libgcrypt \
-		security/p11-kit
+		security/p11-kit>=0.14
 
 CONFIGURE_ARGS=	--disable-update-mime
 
diff --git a/x11/gnome/gcr/distinfo b/x11/gnome/gcr/distinfo
index 2c8f14b812a..025af540c84 100644
--- a/x11/gnome/gcr/distinfo
+++ b/x11/gnome/gcr/distinfo
@@ -1,2 +1,2 @@
-SHA256 (gnome/gcr-3.4.1.tar.xz) = oIErbpYjRlsAU/SxsJ87kxYxeyxu1ppzvCxbO2uElgk=
-SIZE (gnome/gcr-3.4.1.tar.xz) = 1335160
+SHA256 (gnome/gcr-3.6.0.tar.xz) = uE4Hec+Jd5U+n9/qKUv6N3UiynRfdavM+NKikJIHwJA=
+SIZE (gnome/gcr-3.6.0.tar.xz) = 1362412
diff --git a/x11/gnome/gcr/pkg/PLIST b/x11/gnome/gcr/pkg/PLIST
index 3134a657f0b..ca35ee4cd79 100644
--- a/x11/gnome/gcr/pkg/PLIST
+++ b/x11/gnome/gcr/pkg/PLIST
@@ -1,4 +1,4 @@
-@comment $OpenBSD: PLIST,v 1.3 2012/06/15 08:30:19 ajacoutot Exp $
+@comment $OpenBSD: PLIST,v 1.4 2012/09/27 09:30:49 ajacoutot Exp $
 @conflict gnome-keyring-<3.4.0
 %%SHARED%%
 @bin bin/gcr-viewer
@@ -155,6 +155,7 @@ share/gtk-doc/html/gcr-3/gcr-3.devhelp2
 share/gtk-doc/html/gcr-3/gcr-GcrCertificateRequest.html
 share/gtk-doc/html/gcr-3/gcr-GcrColumn.html
 share/gtk-doc/html/gcr-3/gcr-GcrComparable.html
+share/gtk-doc/html/gcr-3/gcr-GcrImportInteraction.html
 share/gtk-doc/html/gcr-3/gcr-Key-Fingerprints.html
 share/gtk-doc/html/gcr-3/gcr-Library-Settings.html
 share/gtk-doc/html/gcr-3/gcr-Non-pageable-Memory.html