Update to gdm-3.6.0.

x11/gnome/gdm/Makefile

@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.128 2012/09/13 08:38:12 ajacoutot Exp $
+# $OpenBSD: Makefile,v 1.129 2012/09/29 19:28:15 ajacoutot Exp $
 
 BROKEN=			needs pam(3)
 
@@ -7,11 +7,11 @@ SHARED_ONLY=		Yes
 COMMENT=		GNOME display manager
 
 GNOME_PROJECT=		gdm
-GNOME_VERSION=		3.4.1
+GNOME_VERSION=		3.6.0
 
 HOMEPAGE=		http://projects.gnome.org/gdm/
 
-SHARED_LIBS +=  gdmgreeter                0.0 # 1.0
+SHARED_LIBS +=  gdm                       0.0 # 1.0
 SHARED_LIBS +=  gdmsimplegreeter          0.0 # 1.0
 
 # GPLv2
@@ -29,7 +29,8 @@ WANTLIB += gobject-2.0 gthread-2.0 gtk-3 ltdl m nspr4 nss3 nssutil3
 WANTLIB += ogg pam pango-1.0 pangocairo-1.0 pangoft2-1.0 pcre
 WANTLIB += pixman-1 plc4 plds4 png pthread pthread-stubs smime3
 WANTLIB += softokn3 sqlite3 ssl3 stdc++ upower-glib util vorbis
-WANTLIB += vorbisfile xcb xcb-render xcb-shm xkbfile xklavier xml2 z
+WANTLIB += vorbisfile xcb xcb-render xcb-shm z icuuc
+WANTLIB += ICE SM atk-bridge-2.0 atspi harfbuzz icudata icule
 
 MODULES=		devel/gettext \
 			x11/gnome \
@@ -42,8 +43,7 @@ LIB_DEPENDS=		audio/libcanberra,-gtk3 \
 			devel/libexecinfo \
 			security/nss \
 			sysutils/accountsservice \
-			sysutils/upower \
+			sysutils/upower
-			x11/gnome/libxklavier 
 # XXX 
 #LIB_DEPENDS +=		security/openpam
 
@@ -95,7 +95,6 @@ pre-configure:
 
 post-install:
 	rm ${PREFIX}/lib/gdm/simple-greeter/extensions/*.la
-	rm -r ${WRKINST}/etc/pam.d
 	rm -rf ${WRKINST}/var/run/gdm
 	${INSTALL_DATA_DIR} ${PREFIX}/share/examples/gdm/{etc/pam.d,var/db}
 	${INSTALL_DATA} ${FILESDIR}/gdm-* \

x11/gnome/gdm/distinfo

@@ -1,2 +1,2 @@
-SHA256 (gnome/gdm-3.4.1.tar.xz) = YpKWjf9fyJh3teGqo8fRSE3T7S1POI6TWEHQU0Ob5mU=
+SHA256 (gnome/gdm-3.6.0.tar.xz) = 6mNzb8j3I0rKRC9OmbO6nMKdzl5GTtk/e/frjEmr1gs=
-SIZE (gnome/gdm-3.4.1.tar.xz) = 1615612
+SIZE (gnome/gdm-3.6.0.tar.xz) = 1627064

x11/gnome/gdm/patches/patch-common_Makefile_in

@@ -1,7 +1,7 @@
-$OpenBSD: patch-common_Makefile_in,v 1.3 2012/09/10 13:19:04 ajacoutot Exp $
+$OpenBSD: patch-common_Makefile_in,v 1.4 2012/09/29 19:28:15 ajacoutot Exp $
---- common/Makefile.in.orig	Sat Apr 14 20:55:28 2012
+--- common/Makefile.in.orig	Tue Sep 25 20:04:05 2012
-+++ common/Makefile.in	Mon Sep 10 14:58:05 2012
++++ common/Makefile.in	Sat Sep 29 19:46:01 2012
-@@ -488,7 +488,7 @@ gdm_crash_logger_CPPFLAGS = \
+@@ -525,7 +525,7 @@ gdm_crash_logger_CPPFLAGS = \
  	-DLOCALSTATEDIR=\"$(localstatedir)\"	\
  	$(NULL)
  
@@ -10,7 +10,7 @@ $OpenBSD: patch-common_Makefile_in,v 1.3 2012/09/10 13:19:04 ajacoutot Exp $
  @MKDTEMP_MISSING_FALSE@MKDTEMP_FILES = 
  @MKDTEMP_MISSING_TRUE@MKDTEMP_FILES = mkdtemp.c mkdtemp.h
  libgdmcommon_la_SOURCES = \
-@@ -532,6 +532,7 @@ libgdmcommon_la_CFLAGS = \
+@@ -574,6 +574,7 @@ libgdmcommon_la_CFLAGS = \
  	$(NULL)
  
  libgdmcommon_la_LIBADD = \

x11/gnome/gdm/patches/patch-configure

@@ -1,16 +1,20 @@
-$OpenBSD: patch-configure,v 1.21 2012/09/10 13:19:04 ajacoutot Exp $
+$OpenBSD: patch-configure,v 1.22 2012/09/29 19:28:15 ajacoutot Exp $
---- configure.orig	Sat Apr 14 20:55:27 2012
+
-+++ configure	Mon Sep 10 14:58:05 2012
+Fix DATADIRNAME: see LOCALBASE/share/aclocal/{glib-gettext.m4,intltool.m4}
-@@ -22896,6 +22896,8 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+
- #ifdef __cplusplus
+--- configure.orig	Tue Sep 25 20:04:03 2012
- extern "C"
++++ configure	Sat Sep 29 20:17:23 2012
- #endif
+@@ -16948,6 +16948,9 @@ else
-+int allow_severity = 1;
+ fi
-+int deny_severity = 1;
+ 
- char hosts_ctl ();
+     ;;
- int
++    *-*-openbsd*)
- main ()
++    DATADIRNAME=share
-@@ -24704,6 +24706,12 @@ else
++    ;;
+     *)
+     DATADIRNAME=lib
+     ;;
+@@ -26390,6 +26395,12 @@ else
    am__EXEEXT_TRUE='#'
    am__EXEEXT_FALSE=
  fi

x11/gnome/gdm/patches/patch-daemon_Makefile_in

@@ -1,14 +1,14 @@
-$OpenBSD: patch-daemon_Makefile_in,v 1.2 2012/09/10 13:19:04 ajacoutot Exp $
+$OpenBSD: patch-daemon_Makefile_in,v 1.3 2012/09/29 19:28:15 ajacoutot Exp $
 
-undefined reference to `logwtmp'
+undefined reference to `logwtmp'...
 
---- daemon/Makefile.in.orig	Sat Apr 14 20:55:28 2012
+--- daemon/Makefile.in.orig	Sat Sep 29 19:56:01 2012
-+++ daemon/Makefile.in	Mon Sep 10 14:58:05 2012
++++ daemon/Makefile.in	Sat Sep 29 19:56:12 2012
-@@ -691,6 +691,7 @@ gdm_factory_slave_LDFLAGS = \
+@@ -754,6 +754,7 @@ gdm_session_worker_LDFLAGS = \
- gdm_factory_slave_LDADD = \
+ gdm_session_worker_LDADD = \
  	$(top_builddir)/common/libgdmcommon.la	\
- 	$(XLIB_LIBS)				\
-+	$(EXTRA_DAEMON_LIBS)			\
  	$(DAEMON_LIBS)				\
++	$(EXTRA_DAEMON_LIBS)			\
  	$(SYSTEMD_LIBS) 			\
+ 	$(LIBSELINUX_LIBS) 			\
  	$(NULL)

x11/gnome/gdm/patches/patch-daemon_gdm-session-record_c

@@ -1,16 +1,15 @@
-$OpenBSD: patch-daemon_gdm-session-record_c,v 1.1 2011/09/12 07:39:21 ajacoutot Exp $
+$OpenBSD: patch-daemon_gdm-session-record_c,v 1.2 2012/09/29 19:28:15 ajacoutot Exp $
 
-implicit declaration of function 'logwtmp'
+XXX push upstream
-implicit declaration of function 'login'
+(login(3), logout(3), logwtmp(3))
 
---- daemon/gdm-session-record.c.orig	Fri Jun 17 15:02:07 2011
+--- daemon/gdm-session-record.c.orig	Thu Sep  6 20:33:20 2012
-+++ daemon/gdm-session-record.c	Fri Jun 17 15:02:27 2011
++++ daemon/gdm-session-record.c	Sat Sep 29 19:46:32 2012
-@@ -33,6 +33,8 @@
+@@ -31,6 +31,7 @@
+ 
+ #if defined(HAVE_UTMP_H)
  #include <utmp.h>
++#include <util.h>
  #endif
  
-+#include <util.h>
-+
  #include <glib.h>
- #include <glib/gi18n.h>
- #include <glib/gstdio.h>

x11/gnome/gdm/patches/patch-data_00-upstream-settings

@@ -1,12 +1,12 @@
-$OpenBSD: patch-data_00-upstream-settings,v 1.2 2011/10/20 07:23:28 ajacoutot Exp $
+$OpenBSD: patch-data_00-upstream-settings,v 1.3 2012/09/29 19:28:15 ajacoutot Exp $
 
 Our gnome-settings-daemon does not provide the
 org.gnome.settings-daemon.plugins.orientation gschema because it depends
 on gudev.
 
---- data/00-upstream-settings.orig	Wed Oct 19 17:41:52 2011
+--- data/00-upstream-settings.orig	Tue Sep  4 20:41:39 2012
-+++ data/00-upstream-settings	Thu Oct 20 08:29:28 2011
++++ data/00-upstream-settings	Sat Sep 29 19:46:01 2012
-@@ -87,9 +87,6 @@ www=''
+@@ -84,9 +84,6 @@ www=''
  [org/gnome/settings-daemon/plugins/mouse]
  active=false
  

x11/gnome/gdm/patches/patch-data_00-upstream-settings-locks

@@ -1,12 +1,12 @@
-$OpenBSD: patch-data_00-upstream-settings-locks,v 1.1 2011/10/19 08:13:04 ajacoutot Exp $
+$OpenBSD: patch-data_00-upstream-settings-locks,v 1.2 2012/09/29 19:28:15 ajacoutot Exp $
 
 Our gnome-settings-daemon does not provide the
 org.gnome.settings-daemon.plugins.orientation gschema because it depends
 on gudev.
 
---- data/00-upstream-settings-locks.orig	Wed Oct 19 08:15:42 2011
+--- data/00-upstream-settings-locks.orig	Tue Sep  4 20:41:39 2012
-+++ data/00-upstream-settings-locks	Wed Oct 19 08:15:48 2011
++++ data/00-upstream-settings-locks	Sat Sep 29 19:46:01 2012
-@@ -39,7 +39,6 @@
+@@ -38,7 +38,6 @@
  /org/gnome/settings-daemon/plugins/media-keys/stop
  /org/gnome/settings-daemon/plugins/media-keys/www
  /org/gnome/settings-daemon/plugins/mouse/active

x11/gnome/gdm/patches/patch-data_gdm-shell_session_in

@@ -1,10 +1,10 @@
-$OpenBSD: patch-data_gdm-shell_session_in,v 1.1 2011/10/19 08:13:04 ajacoutot Exp $
+$OpenBSD: patch-data_gdm-shell_session_in,v 1.2 2012/09/29 19:28:15 ajacoutot Exp $
---- data/gdm-shell.session.in.orig	Wed Oct 19 08:47:27 2011
+--- data/gdm-shell.session.in.orig	Mon Sep 24 22:27:23 2012
-+++ data/gdm-shell.session.in	Wed Oct 19 08:48:10 2011
++++ data/gdm-shell.session.in	Sat Sep 29 19:46:02 2012
 @@ -1,5 +1,5 @@
  [GNOME Session]
  Name=Display Manager
  RequiredComponents=gnome-shell;gnome-settings-daemon;
--IsRunnableHelper=bash -c 'gnome-shell --help | grep -q gdm-mode && @libexecdir@/gnome-session-check-accelerated'
+-IsRunnableHelper=bash -c 'type -p gnome-shell >& /dev/null && @CHECK_ACCELERATED_DIR@/gnome-session-check-accelerated'
 +IsRunnableHelper=sh -c 'gnome-shell --help | grep -q gdm-mode && @libexecdir@/gnome-session-check-accelerated'
  FallbackSession=gdm-fallback

x11/gnome/gdm/patches/patch-gui_simple-greeter_Makefile_in

@@ -1,7 +1,7 @@
-$OpenBSD: patch-gui_simple-greeter_Makefile_in,v 1.3 2012/09/10 13:19:04 ajacoutot Exp $
+$OpenBSD: patch-gui_simple-greeter_Makefile_in,v 1.4 2012/09/29 19:28:15 ajacoutot Exp $
---- gui/simple-greeter/Makefile.in.orig	Sat Apr 14 20:55:29 2012
+--- gui/simple-greeter/Makefile.in.orig	Tue Sep 25 20:04:06 2012
-+++ gui/simple-greeter/Makefile.in	Mon Sep 10 14:58:05 2012
++++ gui/simple-greeter/Makefile.in	Sat Sep 29 19:46:02 2012
-@@ -534,7 +534,7 @@ AM_CPPFLAGS = \
+@@ -573,7 +573,7 @@ AM_CPPFLAGS = \
  	-DGDMCONFDIR=\"$(gdmconfdir)\"                  \
  	-DDATADIR=\""$(datadir)"\"		 	\
  	-DSYSCONFDIR=\""$(sysconfdir)"\"		\

x11/gnome/gdm/pkg/PLIST

@@ -1,4 +1,4 @@
-@comment $OpenBSD: PLIST,v 1.46 2012/09/13 08:38:12 ajacoutot Exp $
+@comment $OpenBSD: PLIST,v 1.47 2012/09/29 19:28:15 ajacoutot Exp $
 @comment starts a full gnome-session as _gdm which requires a valid homedir
 @newgroup _gdm:676
 @newuser _gdm:676:_gdm:daemon:GNOME Display Manager:/var/db/gdm:/sbin/nologin
@@ -14,11 +14,11 @@
 @extraunexec rm -rf /var/cache/gdm/*
 @extraunexec rm -rf /var/log/gdm/*
 @bin bin/gdm-screenshot
-@bin bin/gdmflexiserver
 include/gdm/
-include/gdm/greeter/
+include/gdm/gdm-client-glue.h
-include/gdm/greeter/gdm-greeter-client.h
+include/gdm/gdm-client.h
-include/gdm/greeter/gdm-greeter-sessions.h
+include/gdm/gdm-sessions.h
+include/gdm/gdm-user-switching.h
 include/gdm/simple-greeter/
 include/gdm/simple-greeter/gdm-login-extension.h
 lib/gdm/
@@ -27,16 +27,14 @@ lib/gdm/simple-greeter/extensions/
 lib/gdm/simple-greeter/extensions/libfingerprint.so
 lib/gdm/simple-greeter/extensions/libpassword.so
 lib/gdm/simple-greeter/extensions/libsmartcard.so
-lib/libgdmgreeter.la
+lib/libgdm.la
-@lib lib/libgdmgreeter.so.${LIBgdmgreeter_VERSION}
+@lib lib/libgdm.so.${LIBgdm_VERSION}
 lib/libgdmsimplegreeter.la
 @lib lib/libgdmsimplegreeter.so.${LIBgdmsimplegreeter_VERSION}
-lib/pkgconfig/gdmgreeter.pc
+lib/pkgconfig/gdm.pc
 lib/pkgconfig/gdmsimplegreeter.pc
 @bin libexec/gdm-crash-logger
-@bin libexec/gdm-factory-slave
 @bin libexec/gdm-host-chooser
-@bin libexec/gdm-product-slave
 @bin libexec/gdm-session-worker
 @bin libexec/gdm-simple-chooser
 @bin libexec/gdm-simple-greeter
@@ -112,28 +110,16 @@ share/examples/gdm/var/db/gdm/
 @group _gdm
 @sample /var/db/gdm/
 @mode
-@group
+@owner _gdm
 share/examples/gdm/var/db/gdm/.config/
-@group _gdm
 @sample /var/db/gdm/.config/
-@group
 share/examples/gdm/var/db/gdm/.config/dconf/
-@owner _gdm
-@group _gdm
 @sample /var/db/gdm/.config/dconf/
-@owner
-@group
 share/examples/gdm/var/db/gdm/.local/
-@group _gdm
 @sample /var/db/gdm/.local/
-@group
 share/examples/gdm/var/db/gdm/.local/share/
-@group _gdm
 @sample /var/db/gdm/.local/share/
-@group
 share/examples/gdm/var/db/gdm/.local/share/applications/
-@owner _gdm
-@group _gdm
 @sample /var/db/gdm/.local/share/applications/
 @owner
 @group
@@ -148,7 +134,9 @@ share/gdm/greeter/applications/gnome-shell.desktop
 share/gdm/greeter/applications/gok.desktop
 share/gdm/greeter/applications/mime-dummy-handler.desktop
 share/gdm/greeter/applications/mimeapps.list
-share/gdm/greeter/applications/orca-screen-reader.desktop
+share/gdm/greeter/applications/polkit-gnome-authentication-agent-1.desktop
+share/gdm/greeter/autostart/
+share/gdm/greeter/autostart/orca-autostart.desktop
 share/gdm/locale.alias
 share/gdm/simple-greeter/
 share/gdm/simple-greeter/extensions/
@@ -163,44 +151,60 @@ share/gdm/simple-greeter/extensions/unified/page.ui
 share/glib-2.0/schemas/org.gnome.login-screen.gschema.xml
 share/gnome-session/sessions/gdm-fallback.session
 share/gnome-session/sessions/gdm-shell.session
-share/gnome/help/gdm/
+share/help/C/gdm/
-share/gnome/help/gdm/C/
+share/help/C/gdm/index.docbook
-share/gnome/help/gdm/C/gdm.xml
+share/help/C/gdm/legal.xml
-share/gnome/help/gdm/C/legal.xml
+share/help/ca/gdm/
-share/gnome/help/gdm/ca/
+share/help/ca/gdm/index.docbook
-share/gnome/help/gdm/ca/gdm.xml
+share/help/ca/gdm/legal.xml
-share/gnome/help/gdm/de/
+share/help/de/gdm/
-share/gnome/help/gdm/de/gdm.xml
+share/help/de/gdm/index.docbook
-share/gnome/help/gdm/el/
+share/help/de/gdm/legal.xml
-share/gnome/help/gdm/el/gdm.xml
+share/help/el/gdm/
-share/gnome/help/gdm/en_GB/
+share/help/el/gdm/index.docbook
-share/gnome/help/gdm/en_GB/gdm.xml
+share/help/el/gdm/legal.xml
-share/gnome/help/gdm/es/
+share/help/en_GB/gdm/
-share/gnome/help/gdm/es/gdm.xml
+share/help/en_GB/gdm/index.docbook
-share/gnome/help/gdm/fr/
+share/help/en_GB/gdm/legal.xml
-share/gnome/help/gdm/fr/gdm.xml
+share/help/es/gdm/
-share/gnome/help/gdm/gl/
+share/help/es/gdm/index.docbook
-share/gnome/help/gdm/gl/gdm.xml
+share/help/es/gdm/legal.xml
-share/gnome/help/gdm/id/
+share/help/fr/gdm/
-share/gnome/help/gdm/id/gdm.xml
+share/help/fr/gdm/index.docbook
-share/gnome/help/gdm/it/
+share/help/fr/gdm/legal.xml
-share/gnome/help/gdm/it/gdm.xml
+share/help/gl/gdm/
-share/gnome/help/gdm/ko/
+share/help/gl/gdm/index.docbook
-share/gnome/help/gdm/ko/gdm.xml
+share/help/gl/gdm/legal.xml
-share/gnome/help/gdm/oc/
+share/help/id/gdm/
-share/gnome/help/gdm/oc/gdm.xml
+share/help/id/gdm/index.docbook
-share/gnome/help/gdm/ru/
+share/help/id/gdm/legal.xml
-share/gnome/help/gdm/ru/gdm.xml
+share/help/it/gdm/
-share/gnome/help/gdm/sl/
+share/help/it/gdm/index.docbook
-share/gnome/help/gdm/sl/gdm.xml
+share/help/it/gdm/legal.xml
-share/gnome/help/gdm/sv/
+share/help/ko/gdm/
-share/gnome/help/gdm/sv/gdm.xml
+share/help/ko/gdm/index.docbook
-share/gnome/help/gdm/te/
+share/help/ko/gdm/legal.xml
-share/gnome/help/gdm/te/gdm.xml
+share/help/oc/gdm/
-share/gnome/help/gdm/uk/
+share/help/oc/gdm/index.docbook
-share/gnome/help/gdm/uk/gdm.xml
+share/help/oc/gdm/legal.xml
-share/gnome/help/gdm/zh_CN/
+share/help/ru/gdm/
-share/gnome/help/gdm/zh_CN/gdm.xml
+share/help/ru/gdm/index.docbook
+share/help/ru/gdm/legal.xml
+share/help/sl/gdm/
+share/help/sl/gdm/index.docbook
+share/help/sl/gdm/legal.xml
+share/help/sv/gdm/
+share/help/sv/gdm/index.docbook
+share/help/sv/gdm/legal.xml
+share/help/te/gdm/
+share/help/te/gdm/index.docbook
+share/help/te/gdm/legal.xml
+share/help/uk/gdm/
+share/help/uk/gdm/index.docbook
+share/help/uk/gdm/legal.xml
+share/help/zh_CN/gdm/
+share/help/zh_CN/gdm/index.docbook
+share/help/zh_CN/gdm/legal.xml
 share/icons/hicolor/16x16/apps/gdm-fingerprint.png
 share/icons/hicolor/16x16/apps/gdm-smartcard.png
 share/icons/hicolor/16x16/apps/gdm-xnest.png
@@ -226,6 +230,7 @@ share/locale/ca/LC_MESSAGES/gdm.mo
 share/locale/ca@valencia/LC_MESSAGES/gdm.mo
 share/locale/crh/LC_MESSAGES/gdm.mo
 share/locale/cs/LC_MESSAGES/gdm.mo
+share/locale/csb/LC_MESSAGES/gdm.mo
 share/locale/cy/LC_MESSAGES/gdm.mo
 share/locale/da/LC_MESSAGES/gdm.mo
 share/locale/de/LC_MESSAGES/gdm.mo
@@ -262,6 +267,7 @@ share/locale/km/LC_MESSAGES/gdm.mo
 share/locale/kn/LC_MESSAGES/gdm.mo
 share/locale/ko/LC_MESSAGES/gdm.mo
 share/locale/ku/LC_MESSAGES/gdm.mo
+share/locale/ky/LC_MESSAGES/gdm.mo
 share/locale/lt/LC_MESSAGES/gdm.mo
 share/locale/lv/LC_MESSAGES/gdm.mo
 share/locale/mai/LC_MESSAGES/gdm.mo
@@ -310,25 +316,6 @@ share/locale/zh_CN/LC_MESSAGES/gdm.mo
 share/locale/zh_HK/LC_MESSAGES/gdm.mo
 share/locale/zh_TW/LC_MESSAGES/gdm.mo
 share/locale/zu/LC_MESSAGES/gdm.mo
-share/omf/gdm/
-share/omf/gdm/gdm-C.omf
-share/omf/gdm/gdm-ca.omf
-share/omf/gdm/gdm-de.omf
-share/omf/gdm/gdm-el.omf
-share/omf/gdm/gdm-en_GB.omf
-share/omf/gdm/gdm-es.omf
-share/omf/gdm/gdm-fr.omf
-share/omf/gdm/gdm-gl.omf
-share/omf/gdm/gdm-id.omf
-share/omf/gdm/gdm-it.omf
-share/omf/gdm/gdm-ko.omf
-share/omf/gdm/gdm-oc.omf
-share/omf/gdm/gdm-ru.omf
-share/omf/gdm/gdm-sl.omf
-share/omf/gdm/gdm-sv.omf
-share/omf/gdm/gdm-te.omf
-share/omf/gdm/gdm-uk.omf
-share/omf/gdm/gdm-zh_CN.omf
 share/pixmaps/gdm-foot-logo.png
 share/pixmaps/gdm-setup.png
 share/pixmaps/gdm-xnest.png