diff --git a/devel/gsettings-desktop-schemas/Makefile b/devel/gsettings-desktop-schemas/Makefile index 06f4c99ddf1..4949aaa9df0 100644 --- a/devel/gsettings-desktop-schemas/Makefile +++ b/devel/gsettings-desktop-schemas/Makefile @@ -1,9 +1,10 @@ -# $OpenBSD: Makefile,v 1.31 2012/09/27 08:35:45 ajacoutot Exp $ +# $OpenBSD: Makefile,v 1.32 2012/10/10 12:49:17 ajacoutot Exp $ COMMENT= collection of shared GSettings schemas GNOME_PROJECT= gsettings-desktop-schemas GNOME_VERSION= 3.6.0 +REVISION= 0 CATEGORIES= devel @@ -27,4 +28,8 @@ USE_LIBTOOL= No CONFIGURE_STYLE=gnu +post-install: + ${INSTALL_DATA} ${FILESDIR}/org.gnome.desktop.* \ + ${PREFIX}/share/glib-2.0/schemas + .include diff --git a/devel/gsettings-desktop-schemas/files/org.gnome.desktop.lockdown.gschema.override b/devel/gsettings-desktop-schemas/files/org.gnome.desktop.lockdown.gschema.override new file mode 100644 index 00000000000..7209a601994 --- /dev/null +++ b/devel/gsettings-desktop-schemas/files/org.gnome.desktop.lockdown.gschema.override @@ -0,0 +1,5 @@ +# $OpenBSD: org.gnome.desktop.lockdown.gschema.override,v 1.1 2012/10/10 12:49:17 ajacoutot Exp $ + +# cannot run >1 instance of X(7) under OpenBSD at default securelevel(7) +[org.gnome.desktop.lockdown] +disable-user-switching=true diff --git a/devel/gsettings-desktop-schemas/files/org.gnome.desktop.media-handling.gschema.override b/devel/gsettings-desktop-schemas/files/org.gnome.desktop.media-handling.gschema.override new file mode 100644 index 00000000000..cdd518fd800 --- /dev/null +++ b/devel/gsettings-desktop-schemas/files/org.gnome.desktop.media-handling.gschema.override @@ -0,0 +1,7 @@ +# $OpenBSD: org.gnome.desktop.media-handling.gschema.override,v 1.1 2012/10/10 12:49:17 ajacoutot Exp $ + +# media auto{mount,run} requires udev(8) +[org.gnome.desktop.media-handling] +automount=false +automount-open=false +autorun-never=true diff --git a/devel/gsettings-desktop-schemas/files/org.gnome.desktop.screensaver.gschema.override b/devel/gsettings-desktop-schemas/files/org.gnome.desktop.screensaver.gschema.override new file mode 100644 index 00000000000..e41cd522f8d --- /dev/null +++ b/devel/gsettings-desktop-schemas/files/org.gnome.desktop.screensaver.gschema.override @@ -0,0 +1,5 @@ +# $OpenBSD: org.gnome.desktop.screensaver.gschema.override,v 1.1 2012/10/10 12:49:17 ajacoutot Exp $ + +# cannot run >1 instance of X(7) under OpenBSD at default securelevel(7) +[org.gnome.desktop.screensaver] +user-switch-enabled=false diff --git a/devel/gsettings-desktop-schemas/patches/patch-schemas_org_gnome_desktop_lockdown_gschema_xml_in_in b/devel/gsettings-desktop-schemas/patches/patch-schemas_org_gnome_desktop_lockdown_gschema_xml_in_in deleted file mode 100644 index 5cf92838f4f..00000000000 --- a/devel/gsettings-desktop-schemas/patches/patch-schemas_org_gnome_desktop_lockdown_gschema_xml_in_in +++ /dev/null @@ -1,16 +0,0 @@ -$OpenBSD: patch-schemas_org_gnome_desktop_lockdown_gschema_xml_in_in,v 1.1 2012/04/07 12:21:48 ajacoutot Exp $ - -By default it is not possible to run >1 instance of X(7) under OpenBSD -at securelevel(7) 1, hence it is not possible to switch user. - ---- schemas/org.gnome.desktop.lockdown.gschema.xml.in.in.orig Sat Apr 7 13:55:34 2012 -+++ schemas/org.gnome.desktop.lockdown.gschema.xml.in.in Sat Apr 7 13:55:44 2012 -@@ -34,7 +34,7 @@ - - - -- false -+ true - <_summary>Disable user switching - <_description> - Prevent the user from switching to another account while his session diff --git a/devel/gsettings-desktop-schemas/patches/patch-schemas_org_gnome_desktop_media-handling_gschema_xml_in_in b/devel/gsettings-desktop-schemas/patches/patch-schemas_org_gnome_desktop_media-handling_gschema_xml_in_in deleted file mode 100644 index d0350a328d8..00000000000 --- a/devel/gsettings-desktop-schemas/patches/patch-schemas_org_gnome_desktop_media-handling_gschema_xml_in_in +++ /dev/null @@ -1,28 +0,0 @@ -$OpenBSD: patch-schemas_org_gnome_desktop_media-handling_gschema_xml_in_in,v 1.1 2011/05/27 16:43:33 ajacoutot Exp $ - -Media handling requires udev(8) which doesn't exist under OpenBSD, so no -need to try to auto{mount,run} removable devices by default. - ---- schemas/org.gnome.desktop.media-handling.gschema.xml.in.in.orig Fri May 27 18:28:04 2011 -+++ schemas/org.gnome.desktop.media-handling.gschema.xml.in.in Fri May 27 18:29:05 2011 -@@ -1,17 +1,17 @@ - - - -- true -+ false - <_summary>Whether to automatically mount media - <_description>If set to true, then Nautilus will automatically mount media such as user-visible hard disks and removable media on start-up and media insertion. - - -- true -+ false - <_summary>Whether to automatically open a folder for automounted media - <_description>If set to true, then Nautilus will automatically open a folder when media is automounted. This only applies to media where no known x-content/* type was detected; for media where a known x-content type is detected, the user configurable action will be taken instead. - - -- false -+ true - <_summary>Never prompt or autorun/autostart programs when media are inserted - <_description>If set to true, then Nautilus will never prompt nor autorun/autostart programs when a medium is inserted. - diff --git a/devel/gsettings-desktop-schemas/patches/patch-schemas_org_gnome_desktop_screensaver_gschema_xml_in_in b/devel/gsettings-desktop-schemas/patches/patch-schemas_org_gnome_desktop_screensaver_gschema_xml_in_in deleted file mode 100644 index 41642126e62..00000000000 --- a/devel/gsettings-desktop-schemas/patches/patch-schemas_org_gnome_desktop_screensaver_gschema_xml_in_in +++ /dev/null @@ -1,16 +0,0 @@ -$OpenBSD: patch-schemas_org_gnome_desktop_screensaver_gschema_xml_in_in,v 1.2 2012/09/27 08:35:45 ajacoutot Exp $ - -By default it is not possible to run >1 instance of X(7) under OpenBSD -at securelevel(7) 1, hence it is not possible to switch user. - ---- schemas/org.gnome.desktop.screensaver.gschema.xml.in.in.orig Fri Aug 17 19:51:28 2012 -+++ schemas/org.gnome.desktop.screensaver.gschema.xml.in.in Thu Sep 27 10:33:37 2012 -@@ -46,7 +46,7 @@ - <_description>The command to invoke when the logout button is clicked. This command should simply log the user out without any interaction. This key has effect only if the "logout_enable" key is set to TRUE. - - -- true -+ false - <_summary>Allow user switching - <_description>Set this to TRUE to offer an option in the unlock dialog to switch to a different user account. - diff --git a/devel/gsettings-desktop-schemas/pkg/PLIST b/devel/gsettings-desktop-schemas/pkg/PLIST index e31c39e6c51..81772b58025 100644 --- a/devel/gsettings-desktop-schemas/pkg/PLIST +++ b/devel/gsettings-desktop-schemas/pkg/PLIST @@ -1,4 +1,4 @@ -@comment $OpenBSD: PLIST,v 1.14 2012/09/27 08:35:45 ajacoutot Exp $ +@comment $OpenBSD: PLIST,v 1.15 2012/10/10 12:49:18 ajacoutot Exp $ include/gsettings-desktop-schemas/ include/gsettings-desktop-schemas/gdesktop-enums.h lib/girepository-1.0/ @@ -18,8 +18,11 @@ share/glib-2.0/schemas/org.gnome.desktop.default-applications.gschema.xml share/glib-2.0/schemas/org.gnome.desktop.enums.xml share/glib-2.0/schemas/org.gnome.desktop.input-sources.gschema.xml share/glib-2.0/schemas/org.gnome.desktop.interface.gschema.xml +share/glib-2.0/schemas/org.gnome.desktop.lockdown.gschema.override share/glib-2.0/schemas/org.gnome.desktop.lockdown.gschema.xml +share/glib-2.0/schemas/org.gnome.desktop.media-handling.gschema.override share/glib-2.0/schemas/org.gnome.desktop.media-handling.gschema.xml +share/glib-2.0/schemas/org.gnome.desktop.screensaver.gschema.override share/glib-2.0/schemas/org.gnome.desktop.screensaver.gschema.xml share/glib-2.0/schemas/org.gnome.desktop.session.gschema.xml share/glib-2.0/schemas/org.gnome.desktop.sound.gschema.xml