diff --git a/x11/gnome/settings-daemon/Makefile b/x11/gnome/settings-daemon/Makefile
index 54439ded7ef..bb060dcbf8e 100755
--- a/x11/gnome/settings-daemon/Makefile
+++ b/x11/gnome/settings-daemon/Makefile
@@ -1,12 +1,11 @@
-# $OpenBSD: Makefile,v 1.69 2011/12/16 11:26:34 ajacoutot Exp $
+# $OpenBSD: Makefile,v 1.70 2012/03/29 06:47:51 ajacoutot Exp $
SHARED_ONLY= Yes
COMMENT= GNOME settings daemon
GNOME_PROJECT= gnome-settings-daemon
-GNOME_VERSION= 3.2.2
-REVISION= 3
+GNOME_VERSION= 3.4.0
# GPLv3
PERMIT_PACKAGE_CDROM= Yes
@@ -18,15 +17,14 @@ WANTLIB += GL X11 Xau Xcomposite Xcursor Xdamage Xdmcp Xext Xfixes
WANTLIB += Xi Xinerama Xrandr Xrender Xxf86vm asn1 atk-1.0 c cairo
WANTLIB += cairo-gobject canberra canberra-gtk3 colord crypto
WANTLIB += cups dbus-1 dbus-glib-1 drm execinfo expat ffi fontconfig
-WANTLIB += freetype gconf-2 gdbm gdk-3 gdk_pixbuf-2.0 gio-2.0
-WANTLIB += glib-2.0 gmodule-2.0 gnome-desktop-3 gnomekbd gnomekbdui
-WANTLIB += gobject-2.0 gssapi gthread-2.0 gtk-3 json krb5 lcms2
-WANTLIB += ltdl m notify nspr4 nss3 nssutil3 ogg pango-1.0 pangocairo-1.0
-WANTLIB += pangoft2-1.0 pcre pixman-1 plc4 plds4 png polkit-gobject-1
-WANTLIB += pthread pthread-stubs pulse pulse-mainloop-glib smime3
-WANTLIB += sndfile softokn3 sqlite3 ssl ssl3 stdc++ upower-glib
-WANTLIB += vorbis vorbisfile xcb xcb-render xcb-shm xkbfile xklavier
-WANTLIB += xml2 z
+WANTLIB += freetype gdbm gdk-3 gdk_pixbuf-2.0 gio-2.0 glib-2.0
+WANTLIB += gmodule-2.0 gnome-desktop-3 gnomekbd gnomekbdui gobject-2.0
+WANTLIB += gssapi gthread-2.0 gtk-3 json krb5 lcms2 ltdl m notify
+WANTLIB += nspr4 nss3 nssutil3 ogg pango-1.0 pangocairo-1.0 pangoft2-1.0
+WANTLIB += pcre pixman-1 plc4 plds4 png pthread pthread-stubs
+WANTLIB += pulse pulse-mainloop-glib smime3 sndfile softokn3 sqlite3
+WANTLIB += ssl ssl3 stdc++ upower-glib vorbis vorbisfile xcb xcb-render
+WANTLIB += xcb-shm xkbfile xklavier xml2 z
MODULES= devel/gettext \
x11/gnome
@@ -34,7 +32,6 @@ MODULES= devel/gettext \
LIB_DEPENDS= devel/libnotify>=0.7.2 \
x11/gnome/desktop \
x11/gnome/libgnomekbd \
- sysutils/polkit \
security/nss \
print/cups \
audio/pulseaudio \
@@ -45,6 +42,9 @@ LIB_DEPENDS= devel/libnotify>=0.7.2 \
BUILD_DEPENDS= devel/gsettings-desktop-schemas
RUN_DEPENDS= devel/gsettings-desktop-schemas
+# share/polkit-1/actions/org.gnome.settings-daemon.plugins.power.policy
+RUN_DEPENDS += sysutils/polkit
+
# otherwise we end up without icons on minimal install
RUN_DEPENDS+= x11/gnome/icon-theme
@@ -55,10 +55,12 @@ LIBTOOL_FLAGS= --tag=disable-static
MODGNOME_CPPFLAGS= -I${X11BASE}/include
MODGNOME_LDFLAGS= -L${X11BASE}/lib
+
CONFIGURE_ARGS= --disable-static \
+ --localstatedir=/var \
--disable-packagekit \
--disable-gudev \
- --with-pnpids=${LOCALBASE}/share/libgnome-desktop-3.0/pnp.ids
+ --disable-systemd
FAKE_FLAGS+= desktopdir=${PREFIX}/share/examples/gnome-settings-daemon/xdg/autostart \
sysconfdir=${PREFIX}/share/examples/gnome-settings-daemon \
diff --git a/x11/gnome/settings-daemon/distinfo b/x11/gnome/settings-daemon/distinfo
index 1d3194a6871..f0b342e41a4 100644
--- a/x11/gnome/settings-daemon/distinfo
+++ b/x11/gnome/settings-daemon/distinfo
@@ -1,5 +1,5 @@
-MD5 (gnome/gnome-settings-daemon-3.2.2.tar.xz) = 6yGvNv6s41KZZevhegY9Yw==
-RMD160 (gnome/gnome-settings-daemon-3.2.2.tar.xz) = ibX+hNM3+yQaJvZY5tqjX68f3cE=
-SHA1 (gnome/gnome-settings-daemon-3.2.2.tar.xz) = /Xm3+NKKXUSIOeEZYMngfwzvauU=
-SHA256 (gnome/gnome-settings-daemon-3.2.2.tar.xz) = 2Ryshp4j82lCcgSF8EwwKf1Shvr7atErBzd+UnsfaIQ=
-SIZE (gnome/gnome-settings-daemon-3.2.2.tar.xz) = 1417364
+MD5 (gnome/gnome-settings-daemon-3.4.0.tar.xz) = xY8mVjFelqPlbI5zxwnyDg==
+RMD160 (gnome/gnome-settings-daemon-3.4.0.tar.xz) = 5POu++VXsGLQFzhYOWJhvtmsdmc=
+SHA1 (gnome/gnome-settings-daemon-3.4.0.tar.xz) = VeXyKfapChGgVxH8csC5mCMtIEw=
+SHA256 (gnome/gnome-settings-daemon-3.4.0.tar.xz) = VjnLuijKp7PjOZD0mu7RHtkyXnjnavIXXZzNX/KYQB0=
+SIZE (gnome/gnome-settings-daemon-3.4.0.tar.xz) = 1470012
diff --git a/x11/gnome/settings-daemon/patches/patch-configure b/x11/gnome/settings-daemon/patches/patch-configure
new file mode 100644
index 00000000000..da3ef6daed1
--- /dev/null
+++ b/x11/gnome/settings-daemon/patches/patch-configure
@@ -0,0 +1,105 @@
+$OpenBSD: patch-configure,v 1.7 2012/03/29 06:47:51 ajacoutot Exp $
+
+No libwacom on OpenBSD (depends on gudev).
+
+--- configure.orig Mon Mar 26 18:16:51 2012
++++ configure Mon Mar 26 18:33:34 2012
+@@ -19121,98 +19121,6 @@ fi
+
+
+
+-pkg_failed=no
+-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for WACOM" >&5
+-$as_echo_n "checking for WACOM... " >&6; }
+-
+-if test -n "$WACOM_CFLAGS"; then
+- pkg_cv_WACOM_CFLAGS="$WACOM_CFLAGS"
+- elif test -n "$PKG_CONFIG"; then
+- if test -n "$PKG_CONFIG" && \
+- { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libwacom >= \$LIBWACOM_REQUIRED_VERSION x11 xi xtst \$GUDEV_PKG gnome-desktop-3.0 >= \$GNOME_DESKTOP_REQUIRED_VERSION xorg-wacom\""; } >&5
+- ($PKG_CONFIG --exists --print-errors "libwacom >= $LIBWACOM_REQUIRED_VERSION x11 xi xtst $GUDEV_PKG gnome-desktop-3.0 >= $GNOME_DESKTOP_REQUIRED_VERSION xorg-wacom") 2>&5
+- ac_status=$?
+- $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+- test $ac_status = 0; }; then
+- pkg_cv_WACOM_CFLAGS=`$PKG_CONFIG --cflags "libwacom >= $LIBWACOM_REQUIRED_VERSION x11 xi xtst $GUDEV_PKG gnome-desktop-3.0 >= $GNOME_DESKTOP_REQUIRED_VERSION xorg-wacom" 2>/dev/null`
+-else
+- pkg_failed=yes
+-fi
+- else
+- pkg_failed=untried
+-fi
+-if test -n "$WACOM_LIBS"; then
+- pkg_cv_WACOM_LIBS="$WACOM_LIBS"
+- elif test -n "$PKG_CONFIG"; then
+- if test -n "$PKG_CONFIG" && \
+- { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libwacom >= \$LIBWACOM_REQUIRED_VERSION x11 xi xtst \$GUDEV_PKG gnome-desktop-3.0 >= \$GNOME_DESKTOP_REQUIRED_VERSION xorg-wacom\""; } >&5
+- ($PKG_CONFIG --exists --print-errors "libwacom >= $LIBWACOM_REQUIRED_VERSION x11 xi xtst $GUDEV_PKG gnome-desktop-3.0 >= $GNOME_DESKTOP_REQUIRED_VERSION xorg-wacom") 2>&5
+- ac_status=$?
+- $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+- test $ac_status = 0; }; then
+- pkg_cv_WACOM_LIBS=`$PKG_CONFIG --libs "libwacom >= $LIBWACOM_REQUIRED_VERSION x11 xi xtst $GUDEV_PKG gnome-desktop-3.0 >= $GNOME_DESKTOP_REQUIRED_VERSION xorg-wacom" 2>/dev/null`
+-else
+- pkg_failed=yes
+-fi
+- else
+- pkg_failed=untried
+-fi
+-
+-
+-
+-if test $pkg_failed = yes; then
+- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+-$as_echo "no" >&6; }
+-
+-if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
+- _pkg_short_errors_supported=yes
+-else
+- _pkg_short_errors_supported=no
+-fi
+- if test $_pkg_short_errors_supported = yes; then
+- WACOM_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "libwacom >= $LIBWACOM_REQUIRED_VERSION x11 xi xtst $GUDEV_PKG gnome-desktop-3.0 >= $GNOME_DESKTOP_REQUIRED_VERSION xorg-wacom" 2>&1`
+- else
+- WACOM_PKG_ERRORS=`$PKG_CONFIG --print-errors "libwacom >= $LIBWACOM_REQUIRED_VERSION x11 xi xtst $GUDEV_PKG gnome-desktop-3.0 >= $GNOME_DESKTOP_REQUIRED_VERSION xorg-wacom" 2>&1`
+- fi
+- # Put the nasty error message in config.log where it belongs
+- echo "$WACOM_PKG_ERRORS" >&5
+-
+- as_fn_error $? "Package requirements (libwacom >= $LIBWACOM_REQUIRED_VERSION x11 xi xtst $GUDEV_PKG gnome-desktop-3.0 >= $GNOME_DESKTOP_REQUIRED_VERSION xorg-wacom) were not met:
+-
+-$WACOM_PKG_ERRORS
+-
+-Consider adjusting the PKG_CONFIG_PATH environment variable if you
+-installed software in a non-standard prefix.
+-
+-Alternatively, you may set the environment variables WACOM_CFLAGS
+-and WACOM_LIBS to avoid the need to call pkg-config.
+-See the pkg-config man page for more details." "$LINENO" 5
+-
+-elif test $pkg_failed = untried; then
+- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+-$as_echo "no" >&6; }
+- { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+-as_fn_error $? "The pkg-config script could not be found or is too old. Make sure it
+-is in your PATH or set the PKG_CONFIG environment variable to the full
+-path to pkg-config.
+-
+-Alternatively, you may set the environment variables WACOM_CFLAGS
+-and WACOM_LIBS to avoid the need to call pkg-config.
+-See the pkg-config man page for more details.
+-
+-To get pkg-config, see .
+-See \`config.log' for more details" "$LINENO" 5; }
+-
+-else
+- WACOM_CFLAGS=$pkg_cv_WACOM_CFLAGS
+- WACOM_LIBS=$pkg_cv_WACOM_LIBS
+- { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+-$as_echo "yes" >&6; }
+-
+-fi
+-
+-
+ have_packagekit=false
+ # Check whether --enable-packagekit was given.
+ if test "${enable_packagekit+set}" = set; then :
diff --git a/x11/gnome/settings-daemon/patches/patch-plugins_Makefile_in b/x11/gnome/settings-daemon/patches/patch-plugins_Makefile_in
new file mode 100644
index 00000000000..5cb1a76e458
--- /dev/null
+++ b/x11/gnome/settings-daemon/patches/patch-plugins_Makefile_in
@@ -0,0 +1,15 @@
+$OpenBSD: patch-plugins_Makefile_in,v 1.3 2012/03/29 06:47:51 ajacoutot Exp $
+
+No libwacom on OpenBSD (depends on gudev).
+
+--- plugins/Makefile.in.orig Mon Mar 26 18:16:49 2012
++++ plugins/Makefile.in Mon Mar 26 18:33:34 2012
+@@ -314,7 +314,7 @@ top_srcdir = @top_srcdir@
+ NULL =
+ enabled_plugins = a11y-keyboard a11y-settings automount background \
+ clipboard color cursor dummy power housekeeping keyboard \
+- media-keys mouse sound wacom xrandr xsettings $(NULL) \
++ media-keys mouse sound xrandr xsettings $(NULL) \
+ $(am__append_1) $(am__append_3) $(am__append_5) \
+ $(am__append_7)
+ disabled_plugins = $(NULL) $(am__append_2) $(am__append_4) \
diff --git a/x11/gnome/settings-daemon/patches/patch-plugins_color_gcm-dmi_c b/x11/gnome/settings-daemon/patches/patch-plugins_color_gcm-dmi_c
deleted file mode 100644
index 52d62e6dd6a..00000000000
--- a/x11/gnome/settings-daemon/patches/patch-plugins_color_gcm-dmi_c
+++ /dev/null
@@ -1,30 +0,0 @@
-$OpenBSD: patch-plugins_color_gcm-dmi_c,v 1.3 2011/12/16 11:26:34 ajacoutot Exp $
-
-From 52b9ea0cf11aa72b8251fa11e99cc58054b9c81c Mon Sep 17 00:00:00 2001
-From: Antoine Jacoutot
-Date: Fri, 16 Dec 2011 09:27:47 +0000
-Subject: color plugin: prevent sysfs warning on !linux
-
---- plugins/color/gcm-dmi.c.orig Fri Dec 16 09:45:32 2011
-+++ plugins/color/gcm-dmi.c Fri Dec 16 10:01:37 2011
-@@ -122,6 +122,7 @@ gcm_dmi_class_init (GcmDmiClass *klass)
- static void
- gcm_dmi_init (GcmDmi *dmi)
- {
-+#if defined(__linux__)
- const gchar *sysfs_name[] = {
- "/sys/class/dmi/id/product_name",
- "/sys/class/dmi/id/board_name",
-@@ -136,6 +137,12 @@ gcm_dmi_init (GcmDmi *dmi)
- "/sys/class/dmi/id/chassis_vendor",
- "/sys/class/dmi/id/board_vendor",
- NULL};
-+#else
-+#warning Please add dmi support for your OS
-+ const gchar *sysfs_name[] = { NULL };
-+ const gchar *sysfs_version[] = { NULL };
-+ const gchar *sysfs_vendor[] = { NULL };
-+#endif
-
- dmi->priv = GCM_DMI_GET_PRIVATE (dmi);
-
diff --git a/x11/gnome/settings-daemon/patches/patch-plugins_power_gsd-backlight-helper_c b/x11/gnome/settings-daemon/patches/patch-plugins_power_gsd-backlight-helper_c
deleted file mode 100644
index bbd58cef318..00000000000
--- a/x11/gnome/settings-daemon/patches/patch-plugins_power_gsd-backlight-helper_c
+++ /dev/null
@@ -1,24 +0,0 @@
-$OpenBSD: patch-plugins_power_gsd-backlight-helper_c,v 1.1 2011/09/27 09:35:06 ajacoutot Exp $
-
-XXX make gnome-power-backlight-helper do nothing and return 0.
-
---- plugins/power/gsd-backlight-helper.c.orig Wed Sep 7 12:29:58 2011
-+++ plugins/power/gsd-backlight-helper.c Tue Sep 27 10:56:35 2011
-@@ -132,6 +132,7 @@ out:
- int
- main (int argc, char *argv[])
- {
-+#ifndef __OpenBSD__
- GOptionContext *context;
- gint uid;
- gint euid;
-@@ -267,5 +268,9 @@ out:
- g_free (filename_file);
- g_free (contents);
- return retval;
-+#else
-+ g_print ("This program does nothing on OpenBSD (no support for sysfs(2)).\n");
-+ return 0;
-+#endif
- }
-
diff --git a/x11/gnome/settings-daemon/pkg/PLIST b/x11/gnome/settings-daemon/pkg/PLIST
index f05a819145a..25a88afb680 100644
--- a/x11/gnome/settings-daemon/pkg/PLIST
+++ b/x11/gnome/settings-daemon/pkg/PLIST
@@ -1,4 +1,4 @@
-@comment $OpenBSD: PLIST,v 1.23 2011/12/03 22:17:17 ajacoutot Exp $
+@comment $OpenBSD: PLIST,v 1.24 2012/03/29 06:47:52 ajacoutot Exp $
include/gnome-settings-daemon-3.0/
include/gnome-settings-daemon-3.0/gnome-settings-daemon/
include/gnome-settings-daemon-3.0/gnome-settings-daemon/gnome-settings-plugin.h
@@ -10,7 +10,6 @@ lib/gnome-settings-daemon-3.0/clipboard.gnome-settings-plugin
lib/gnome-settings-daemon-3.0/color.gnome-settings-plugin
lib/gnome-settings-daemon-3.0/cursor.gnome-settings-plugin
lib/gnome-settings-daemon-3.0/housekeeping.gnome-settings-plugin
-lib/gnome-settings-daemon-3.0/keybindings.gnome-settings-plugin
lib/gnome-settings-daemon-3.0/keyboard.gnome-settings-plugin
@comment lib/gnome-settings-daemon-3.0/liba11y-keyboard.la
lib/gnome-settings-daemon-3.0/liba11y-keyboard.so
@@ -24,10 +23,10 @@ lib/gnome-settings-daemon-3.0/libclipboard.so
lib/gnome-settings-daemon-3.0/libcolor.so
@comment lib/gnome-settings-daemon-3.0/libcursor.la
lib/gnome-settings-daemon-3.0/libcursor.so
+@comment lib/gnome-settings-daemon-3.0/libgsd.la
+lib/gnome-settings-daemon-3.0/libgsd.so
@comment lib/gnome-settings-daemon-3.0/libhousekeeping.la
lib/gnome-settings-daemon-3.0/libhousekeeping.so
-@comment lib/gnome-settings-daemon-3.0/libkeybindings.la
-lib/gnome-settings-daemon-3.0/libkeybindings.so
@comment lib/gnome-settings-daemon-3.0/libkeyboard.la
lib/gnome-settings-daemon-3.0/libkeyboard.so
@comment lib/gnome-settings-daemon-3.0/libmedia-keys.la
@@ -42,8 +41,6 @@ lib/gnome-settings-daemon-3.0/libprint-notifications.so
lib/gnome-settings-daemon-3.0/libsmartcard.so
@comment lib/gnome-settings-daemon-3.0/libsound.la
lib/gnome-settings-daemon-3.0/libsound.so
-@comment lib/gnome-settings-daemon-3.0/libwacom.la
-lib/gnome-settings-daemon-3.0/libwacom.so
@comment lib/gnome-settings-daemon-3.0/libxrandr.la
lib/gnome-settings-daemon-3.0/libxrandr.so
@comment lib/gnome-settings-daemon-3.0/libxsettings.la
@@ -54,27 +51,17 @@ lib/gnome-settings-daemon-3.0/power.gnome-settings-plugin
lib/gnome-settings-daemon-3.0/print-notifications.gnome-settings-plugin
lib/gnome-settings-daemon-3.0/smartcard.gnome-settings-plugin
lib/gnome-settings-daemon-3.0/sound.gnome-settings-plugin
-lib/gnome-settings-daemon-3.0/wacom.gnome-settings-plugin
lib/gnome-settings-daemon-3.0/xrandr.gnome-settings-plugin
lib/gnome-settings-daemon-3.0/xsettings.gnome-settings-plugin
lib/pkgconfig/gnome-settings-daemon.pc
@bin libexec/gnome-fallback-mount-helper
@bin libexec/gnome-settings-daemon
-@bin libexec/gsd-backlight-helper
-@bin libexec/gsd-datetime-mechanism
@bin libexec/gsd-locate-pointer
@bin libexec/gsd-printer
@man man/man1/gnome-settings-daemon.1
share/GConf/gsettings/gnome-settings-daemon.convert
share/dbus-1/services/org.gnome.SettingsDaemon.service
-share/dbus-1/system-services/org.gnome.SettingsDaemon.DateTimeMechanism.service
share/examples/gnome-settings-daemon/
-share/examples/gnome-settings-daemon/dbus-1/
-@sample ${SYSCONFDIR}/dbus-1/
-share/examples/gnome-settings-daemon/dbus-1/system.d/
-@sample ${SYSCONFDIR}/dbus-1/system.d/
-share/examples/gnome-settings-daemon/dbus-1/system.d/org.gnome.SettingsDaemon.DateTimeMechanism.conf
-@sample ${SYSCONFDIR}/dbus-1/system.d/org.gnome.SettingsDaemon.DateTimeMechanism.conf
share/examples/gnome-settings-daemon/gnome-settings-daemon/
share/examples/gnome-settings-daemon/gnome-settings-daemon/xrandr/
@sample ${SYSCONFDIR}/gnome-settings-daemon/
@@ -210,7 +197,6 @@ share/locale/zh_HK/LC_MESSAGES/gnome-settings-daemon.mo
share/locale/zh_TW/LC_MESSAGES/gnome-settings-daemon.mo
share/locale/zu/LC_MESSAGES/gnome-settings-daemon.mo
share/polkit-1/actions/org.gnome.settings-daemon.plugins.power.policy
-share/polkit-1/actions/org.gnome.settingsdaemon.datetimemechanism.policy
@exec %D/bin/glib-compile-schemas %D/share/glib-2.0/schemas >/dev/null
@unexec-delete %D/bin/glib-compile-schemas %D/share/glib-2.0/schemas >/dev/null
@exec %D/bin/gtk-update-icon-cache -q %D/share/icons/hicolor 2>/dev/null || true