From bd1a7b5a4dfbc061924c9ec3e8a0f75a36f8aacc Mon Sep 17 00:00:00 2001
From: ajacoutot <ajacoutot@openbsd.org>
Date: Thu, 26 Sep 2013 15:11:45 +0000
Subject: [PATCH] Update to gnome-session-3.10.0.

---
 x11/gnome/session/Makefile  | 23 ++++++++++++-----------
 x11/gnome/session/distinfo  |  4 ++--
 x11/gnome/session/pkg/PLIST |  8 +++++---
 3 files changed, 19 insertions(+), 16 deletions(-)

diff --git a/x11/gnome/session/Makefile b/x11/gnome/session/Makefile
index 5abc4ec9e9b..ce81c14cc07 100644
--- a/x11/gnome/session/Makefile
+++ b/x11/gnome/session/Makefile
@@ -1,24 +1,25 @@
-# $OpenBSD: Makefile,v 1.232 2013/08/06 19:08:15 ajacoutot Exp $
+# $OpenBSD: Makefile,v 1.233 2013/09/26 15:11:45 ajacoutot Exp $
 
 COMMENT=		GNOME session
 
 GNOME_PROJECT=		gnome-session
-GNOME_VERSION=		3.8.4
+GNOME_VERSION=		3.10.0
 
 CATEGORIES=		x11
 
 # GPLv2/LGPLv2/GFDLv1.1
 PERMIT_PACKAGE_CDROM=	Yes
 
-WANTLIB += GL ICE SM X11 Xau Xcomposite Xcursor Xdamage Xext Xfixes
-WANTLIB += Xi Xinerama Xrandr Xrender Xtst Xxf86vm atk-1.0 atk-bridge-2.0
-WANTLIB += atspi c cairo cairo-gobject dbus-1 dbus-glib-1 drm
-WANTLIB += execinfo expat ffi fontconfig freetype gconf-2 gdk-3
-WANTLIB += gdk_pixbuf-2.0 gio-2.0 glib-2.0 gmodule-2.0 gnome-desktop-3
-WANTLIB += gobject-2.0 graphite2 gthread-2.0 gtk-3 harfbuzz
-WANTLIB += json-glib-1.0 m pango-1.0 pangocairo-1.0
-WANTLIB += pangoft2-1.0 pcre pixman-1 png pthread pthread-stubs
-WANTLIB += stdc++ upower-glib xcb xcb-render xcb-shm xkbfile z
+WANTLIB += GL ICE SM X11 X11-xcb Xau Xcomposite Xcursor Xdamage
+WANTLIB += Xdmcp Xext Xfixes Xi Xinerama Xrandr Xrender Xtst Xxf86vm
+WANTLIB += atk-1.0 atk-bridge-2.0 atspi c cairo cairo-gobject
+WANTLIB += dbus-1 dbus-glib-1 drm execinfo expat ffi fontconfig
+WANTLIB += freetype gconf-2 gdk-3 gdk_pixbuf-2.0 gio-2.0 glapi
+WANTLIB += glib-2.0 gmodule-2.0 gnome-desktop-3 gobject-2.0 graphite2
+WANTLIB += gthread-2.0 gtk-3 harfbuzz json-glib-1.0 m pango-1.0
+WANTLIB += pangocairo-1.0 pangoft2-1.0 pcre pixman-1 png pthread
+WANTLIB += pthread-stubs stdc++ upower-glib xcb xcb-dri2 xcb-glx
+WANTLIB += xcb-render xcb-shm xkbfile 
 
 MODULES=	devel/dconf \
 		devel/gettext \
diff --git a/x11/gnome/session/distinfo b/x11/gnome/session/distinfo
index 5847e45a99f..57166e437ae 100644
--- a/x11/gnome/session/distinfo
+++ b/x11/gnome/session/distinfo
@@ -1,2 +1,2 @@
-SHA256 (gnome/gnome-session-3.8.4.tar.xz) = 5szHFWPZ420WbruKHp/JYv8xYF1YAK9BHTuN9JTwPsE=
-SIZE (gnome/gnome-session-3.8.4.tar.xz) = 781124
+SHA256 (gnome/gnome-session-3.10.0.tar.xz) = ONkMXVoz7IowAvHnfiAcFVTuuLu6iSPZT6uBs6jgaW4=
+SIZE (gnome/gnome-session-3.10.0.tar.xz) = 773640
diff --git a/x11/gnome/session/pkg/PLIST b/x11/gnome/session/pkg/PLIST
index d7f179697fe..741bfe20965 100644
--- a/x11/gnome/session/pkg/PLIST
+++ b/x11/gnome/session/pkg/PLIST
@@ -1,4 +1,4 @@
-@comment $OpenBSD: PLIST,v 1.43 2013/03/29 15:41:03 ajacoutot Exp $
+@comment $OpenBSD: PLIST,v 1.44 2013/09/26 15:11:46 ajacoutot Exp $
 @bin bin/gnome-session
 @bin bin/gnome-session-inhibit
 @bin bin/gnome-session-properties
@@ -11,15 +11,15 @@
 @man man/man1/gnome-session-quit.1
 @man man/man1/gnome-session.1
 share/GConf/gsettings/gnome-session.convert
-share/applications/session-properties.desktop
+share/applications/gnome-session-properties.desktop
 share/doc/gnome-session/
 share/doc/gnome-session/dbus/
 share/doc/gnome-session/dbus/gnome-session.html
 share/glib-2.0/schemas/org.gnome.SessionManager.gschema.xml
-share/gnome-session/gsm-inhibit-dialog.ui
 share/gnome-session/hardware-compatibility
 share/gnome-session/session-properties.ui
 share/gnome-session/sessions/gnome-dummy.session
+share/gnome-session/sessions/gnome-wayland.session
 share/gnome-session/sessions/gnome.session
 share/icons/hicolor/16x16/apps/session-properties.png
 share/icons/hicolor/22x22/apps/session-properties.png
@@ -142,6 +142,8 @@ share/locale/zh_CN/LC_MESSAGES/gnome-session-3.0.mo
 share/locale/zh_HK/LC_MESSAGES/gnome-session-3.0.mo
 share/locale/zh_TW/LC_MESSAGES/gnome-session-3.0.mo
 share/locale/zu/LC_MESSAGES/gnome-session-3.0.mo
+share/wayland-sessions/
+share/wayland-sessions/gnome-wayland.desktop
 share/xsessions/
 share/xsessions/gnome.desktop
 @exec %D/bin/gtk-update-icon-cache -q -t %D/share/icons/hicolor