Update gnome-settings-daemon to 2.26.0.

==============
Version 2.26.0
==============
- Make build work with -Wl,-z,defs (Christopher Taylor) (#574452)
- Updated translations:
  - as (Amitakhya Phukan)
  - ca (Gil Forcada)
  - cs (Petr Kovar)
  - da (Kenneth Nielsen)
  - de (Mario Blättermann)
  - el (Kostas Papadimas)
  - eu (Inaki Larranaga Murgoitio)
  - gl (Ignacio Casal Quinteiro)
  - gu (Ankitkumar Patel)
  - he (Yair Hershkovitz)
  - hi (Rajesh Ranjan)
  - it (Luca Ferretti)
  - ja (Takeshi AIHANA)
  - lt (Gintautas Miliauskas)
  - ml (Ani Peter)
  - mr (Sandeep Shedmake)
  - or (Manoj Kumar Giri)
  - ro (Mișu Moldovan)
  - ru (Nickolay V. Shmyrev)
  - ta (I. Felix)
  - te (Krishnababu K)

===============
Version 2.25.92
===============
- don't print warnings for disabled custom shortcuts (Jens Granseuer)
- revert screen resolution change if the user closes the confirmation window
  using the close icon or by pressing escape (Jens Granseuer) (#571492)
- add missing keys for a11y shortcut keys to GConf schemas (Jens Granseuer)
  (#572807)
- install gnome-settings-daemon-plugin.h for custom plugin developement
  (Jens Granseuer) (#573610)
- Updated translations:
  - bg (Alexander Shopov)
  - en_GB (Philip Withnall)
  - es (Jorge Gonzalez)
  - fi (Ilkka Tuohela)
  - fr (Claude Paroz)
  - gu (Sweta Kothari)
  - hu (Gabor Kelemen)
  - ko (Changwoo Ryu)
  - nl (Wouter Bolsterlee)
  - pl (Tomasz Dominikowski)
  - pt (Duarte Loreto)
  - pt_BR (Krix Apolinário, Vladimir Melo)
  - sv (Daniel Nylander)
  - th (Theppitak Karoonboonyanan)
  - zh_HK (Chao-Hsiung Liao)
  - zh_TW (Chao-Hsiung Liao)

===============
Version 2.25.91
===============
- Have gnome-session restart g-s-d if it crashes (Matthias Clasen)
- Add --without-libnotify to disable notifications (Nirbheek Chauchan)
- Avoid warnings due to notifications on nonexisting status icons
  (Matthias Clasen)
- Fix crash with invalid keyboard shortcuts (Jens Granseuer)
- fix label for "Don't show this message again" checkbox (Luca Ferretti) (#517821)
- HIG fix for button labels (Luca Ferretti) (#571819)
- Don't use legacy icons for keyboard and mouse (Luca Ferretti) (#571823)
- Fix alignment of the composited media window (Leo Iannacone) (#567249)
- Updated translations:
  - ast (Mikel González)
  - ca (Gil Forcada)
  - da (Kenneth Nielsen)
  - es (Jorge Gonzalez)
  - eu (Iñaki Larrañaga Murgoitio)
  - ja (Takeshi AIHANA)
  - nl (Wouter Bolsterlee)
  - pl (Tomasz Dominikowski)
  - ro (Jani Monoses)
  - sv (Daniel Nylander)
  - vi (Clytie Siddall)

===============
Version 2.25.90
===============
- Initialize thread system (Frederic Peters) (#565515)
- Better support for Eject and Sleep actions on BSD (Jasper Lievisse Adriaanse)
  (#565472)
- Spawn screensaver after a 30 second timeout instead of when idle so that it
  doesn't compete with other processes when the session starts (Jens Granseuer)
  (#564059)
- Add low diskspace notification (Vincent Untz) (#557647)
- Support hotkeys for a11y tools (Matthias Clasen) (#565310)
- Quiet xrdb when there are duplicate rules in the .ad files (Bastien Nocera)
  (#566610)
- Add debugging output when de/registering media players (Jens Granseuer)
  (#564433)
- Add a new sound plugin that tells PulseAudio to drop its sample cache when
  the sound theme changes (Lennart Poettering) (#545386)
- Don't pop up an error message when there's no randr configuration file
  (Federico Mena Quintero)
- Ungrab keys when key-related plugins are disabled (Jens Granseuer) (#567867)
- Use PulseAudio directly to change the volume (Bastien Nocera) (#567177)
- Don't draw_background immediately when nautilus is disabled, GnomeBG will
  send a signal (Ray Strode)
- Add crossfade transition when switching backgrounds (Ray Strode) (#552857)
- Use XF86Explorer to launch the file manager (Bastien Nocera)
- Fix possible crash when pressing Fn-F7 (Andres Freund) (#568713)
- Delay drawing the background until SessionRunning (Ray Stode)
- Ask for confirmation with a timeout after changing the randr configuration
  (Federico Mena Quintero) (#545115)
- Require gnome-desktop 2.25.6 (Jen Granseuer)
- Plug leaks
- Build fixes
- Updated translations:
  - es (Jorge González)
  - et (Mattias Põldaru)
  - he (Yuval Tanny)
  - hu (Gabor Kelemen)
  - it (Luca Ferretti)
  - ko (Changwoo Ryu)
  - nb (Kjartan Maraas)
  - pt_BR (Krix Apolinário)
  - sv (Daniel Nylander)
  - zh_CN (甘露(Gan Lu))

==============
Version 2.25.3
==============
- Add support for fn-f7 type keys (Søren Sandmann)
- Use D-Bus instead of an X client mesage in the xrandr plugin, so
  the front-end can get error messages as well (Federico Mena Quintero)
- Fix crash when the X server doesn't have the XInput extension (Jens Granseuer) (#562977)
- Don't call umask (Behdad Esfahbod) (#563543)
- Shut the daemon down properly when the SIGTERM signal is received or the
  D-Bus bus goes away (Ray Strode)
- Restore AccessX bits to original values on exit, fixes sticky keys
  coming on when gnome-settings-daemon has exited (Ray Strode)
- Use only top-level glib and gtk+ headers (Pedro Fragoso) (#563796)

==============
Version 2.25.2
==============
- No need to trap XkbQueryExtension and friends errors (Jens Granseuer) (#559346)
- Add some performance annotations around libxklavier calls (Behdad Esfahbod)
- Start managers in idle callbacks (Behdad Esfahbod) (#559482, #559564)
- Only initialize fontconfig when starting up (Behdad Esfahbod) (#559550)
- Remove unnecessary X error traps (Jens Granseuer) (#559562)
- Init a11y status icon only when needed (Behdad Esfahbod) (#559558)
- Reshufle plugin priorities a bit (Behdad Esfhabod)
- Delay constructing the GnomeBg object until we need it (Behdad Esfahbod)
  (#559639)
- Listen for DeviceEnabled instead of DeviceAdded to be sure the mouse has
  been initialized (William Grant) (#559827)
- Add debugging output for volume_step (Jens Granseuer)
- Fork before gtk_init (Behdad Esfahbod) (#559695)
- Lockdown in the keybinding plugin (Matthias Clasen) (#553434)
- Trap X errors so we don't crash on X servers that don't support DevicePresence
  (Jens Granseuer) (#560618)
- Fix handling of time = GDK_CURRENT_TIME (Jens Granseuer) (#559797)
- Add bundle_loader linker flag to fix compilation on MacOS X (dmack@netspace.org)
  (#522673)
- Grab all keycodes that match the respective keysim (Mario Limonciello) (#561275)
- Fix --no-daemon (Behdad Esfahbod)
- Depend on libxklavier 3.8 (Sergey Udaltsov)
- Fix checks for various X libraries (Jens Granseuer)
- Fix check for xklavier device discovery (Jens Granseuer)

==============
Version 2.25.1
==============
- Ignore the 'activate' signal for deselected items so that the rotation
  setting doesn't reset when the systray menu is opened (Eric Piel)
  (#554951)
- Don't make togglekeys_enable depend on global AccessX state (Jens
  Granseuer) (#555009)
- Fix picking up of the GDM layout (Matthias Clasen) (#554525 and
  #555873)
- Use printf safely (Christian Persch) (#555553)
- Show the shutdown dialog when the power button is pressed (Matthias
  Clasen) (#556307)
- Support the Gtk/ButtonImages XSetting (Matthias Clasen) (#556797)
- Clean-up volume initialization (Jens Granseuer) (#552383)
- Make the composited volume images more clear (Bogdan Butnaru)
  (#557307)
- Spawn screensaver process in idle callback (Rodrigo Moya)
- Remove sound plugin (Jens Granseuer) (#557806)
- Replace gnome_help_display_desktop with gtk_show_uri (Jens Granseuer)
  (#557808)
- Listen for X device changes and reconfigure the mouse if necessary
  (William Grant) (#549267)
- Remove AM_MAINTAINER_MODE (Jens Granseuer) (#558503)
- Disable xrdb plugin by default (Behdad Esfahbod) (#557807)
- Improve performance logging annotations (Behdad Esfahbod) (#559162)
- Cleanup font module (Behdad Esfahbod) (#559163)
- Don't trap errors around grab_key (Behdad Esfahbod) (#559164)
- Don't run 'mousetweaks -s' at startup (Behdad Esfahbod) (#559165)
- Start fontconfig monitors, mouse and clipboard managers in idle
  callbacks (Behdad Esfahbod) (#559166)
- Preload gconf dirs when feasible (Behdad Esfahbod) (#559167)
- Wait for initialization processes to be done before spawning other
  processes (Behdad Esfahbod) (#559168)
- Don't close stderr to not lose warnings (Behdad Esfahbod)
- Use a pipe to communicate between children and parent process instead
  of a signal (Behdad Esfahbod)
- Updated translations:
  - et (Priit Laes)
  - mk (Jovan Naumovski)
  - pt_BR (Leonardo Ferreira Fontenelle)
  - sk (Marcel Telka)

6 files changed, 17 insertions, 83 deletions

diff --git a/sysutils/gnome-settings-daemon/Makefile b/sysutils/gnome-settings-daemon/Makefile
index f81aa68f40a..94a449b8373 100644
--- a/sysutils/gnome-settings-daemon/Makefile
+++ b/sysutils/gnome-settings-daemon/Makefile
@@ -1,10 +1,9 @@
-# $NetBSD: Makefile,v 1.11 2008/12/18 15:56:13 jmcneill Exp $
+# $NetBSD: Makefile,v 1.12 2009/03/16 16:21:36 jmcneill Exp $
 #
 
-DISTNAME=	gnome-settings-daemon-2.24.1
-PKGREVISION=	1
+DISTNAME=	gnome-settings-daemon-2.26.0
 CATEGORIES=	sysutils
-MASTER_SITES=	${MASTER_SITE_GNOME:=sources/gnome-settings-daemon/2.24/}
+MASTER_SITES=	${MASTER_SITE_GNOME:=sources/gnome-settings-daemon/2.26/}
 EXTRACT_SUFX=	.tar.bz2
 
 MAINTAINER=	pkgsrc-users@NetBSD.org
@@ -21,6 +20,7 @@ CONFLICTS+=	gnome-control-center<2.22.0
 
 GCONF_SCHEMAS+=	gnome-settings-daemon.schemas
 GCONF_SCHEMAS+=	desktop_gnome_font_rendering.schemas
+GCONF_SCHEMAS+=	desktop_gnome_keybindings.schemas
 GCONF_SCHEMAS+=	apps_gnome_settings_daemon_keybindings.schemas
 GCONF_SCHEMAS+=	apps_gnome_settings_daemon_screensaver.schemas
 GCONF_SCHEMAS+=	apps_gnome_settings_daemon_xrandr.schemas
@@ -28,6 +28,8 @@ PKGCONFIG_OVERRIDE+=	data/gnome-settings-daemon.pc.in
 
 BUILDLINK_API_DEPENDS.libxklavier+=	libxklavier>=3.3
 
+.include "../../audio/pulseaudio/buildlink3.mk"
+.include "../../databases/gdbm/buildlink3.mk"
 .include "../../devel/GConf/schemas.mk"
 .include "../../devel/libglade/buildlink3.mk"
 .include "../../devel/libgnome/buildlink3.mk"
@@ -36,6 +38,7 @@ BUILDLINK_API_DEPENDS.libxklavier+=	libxklavier>=3.3
 .include "../../multimedia/gstreamer0.10/buildlink3.mk"
 .include "../../sysutils/dbus-glib/buildlink3.mk"
 .include "../../sysutils/desktop-file-utils/desktopdb.mk"
+.include "../../sysutils/libnotify/buildlink3.mk"
 .include "../../x11/gnome-desktop/buildlink3.mk"
 .include "../../x11/gtk2/buildlink3.mk"
 .include "../../x11/libgnomekbd/buildlink3.mk"
diff --git a/sysutils/gnome-settings-daemon/PLIST b/sysutils/gnome-settings-daemon/PLIST
index 2dba0803f83..3d581a8d5ca 100644
--- a/sysutils/gnome-settings-daemon/PLIST
+++ b/sysutils/gnome-settings-daemon/PLIST
@@ -1,5 +1,6 @@
-@comment $NetBSD: PLIST,v 1.3 2008/11/14 01:01:51 wiz Exp $
+@comment $NetBSD: PLIST,v 1.4 2009/03/16 16:21:36 jmcneill Exp $
 include/gnome-settings-daemon-2.0/gnome-settings-daemon/gnome-settings-client.h
+include/gnome-settings-daemon-2.0/gnome-settings-daemon/gnome-settings-plugin.h
 lib/gnome-settings-daemon-2.0/a11y-keyboard.gnome-settings-plugin
 lib/gnome-settings-daemon-2.0/background.gnome-settings-plugin
 lib/gnome-settings-daemon-2.0/clipboard.gnome-settings-plugin
@@ -39,7 +40,9 @@ share/gconf/schemas/apps_gnome_settings_daemon_keybindings.schemas
 share/gconf/schemas/apps_gnome_settings_daemon_screensaver.schemas
 share/gconf/schemas/apps_gnome_settings_daemon_xrandr.schemas
 share/gconf/schemas/desktop_gnome_font_rendering.schemas
+share/gconf/schemas/desktop_gnome_keybindings.schemas
 share/gconf/schemas/gnome-settings-daemon.schemas
+share/gnome-control-center/keybindings/50-accessibility.xml
 share/gnome-settings-daemon/acme-eject.png
 share/gnome-settings-daemon/acme.glade
 share/gnome-settings-daemon/gsd-a11y-preferences-dialog.glade
@@ -59,6 +62,8 @@ share/icons/hicolor/scalable/apps/gsd-xrandr.svg
 share/locale/af/LC_MESSAGES/gnome-settings-daemon.mo
 share/locale/am/LC_MESSAGES/gnome-settings-daemon.mo
 share/locale/ar/LC_MESSAGES/gnome-settings-daemon.mo
+share/locale/as/LC_MESSAGES/gnome-settings-daemon.mo
+share/locale/ast/LC_MESSAGES/gnome-settings-daemon.mo
 share/locale/az/LC_MESSAGES/gnome-settings-daemon.mo
 share/locale/be/LC_MESSAGES/gnome-settings-daemon.mo
 share/locale/be@latin/LC_MESSAGES/gnome-settings-daemon.mo
diff --git a/sysutils/gnome-settings-daemon/distinfo b/sysutils/gnome-settings-daemon/distinfo
index 23c172b5eb3..b3d490b755f 100644
--- a/sysutils/gnome-settings-daemon/distinfo
+++ b/sysutils/gnome-settings-daemon/distinfo
@@ -1,9 +1,6 @@
-$NetBSD: distinfo,v 1.7 2008/12/18 15:56:13 jmcneill Exp $
+$NetBSD: distinfo,v 1.8 2009/03/16 16:21:36 jmcneill Exp $
 
-SHA1 (gnome-settings-daemon-2.24.1.tar.bz2) = d0dbf6ba82cdc1e814d6c46bdc363e61ee9fd0f3
-RMD160 (gnome-settings-daemon-2.24.1.tar.bz2) = 27d432cd217a836fcef0deac5f80f638a73cda7c
-Size (gnome-settings-daemon-2.24.1.tar.bz2) = 1131518 bytes
-SHA1 (patch-aa) = 66ed26db1eb571bdf6bc4640c989e6384d2f99db
-SHA1 (patch-ab) = 28315b12cb41d4c1072f6dd683c2e23eedc116b3
+SHA1 (gnome-settings-daemon-2.26.0.tar.bz2) = ccdf4ddb5e736d03a87843865c3462e55335f093
+RMD160 (gnome-settings-daemon-2.26.0.tar.bz2) = bb5c0554aa5d635cffc042c92d373e77ea3ff82a
+Size (gnome-settings-daemon-2.26.0.tar.bz2) = 1143867 bytes
 SHA1 (patch-ac) = 6e77934d2ad8a75a0b476cf26a3ec72ea8160b23
-SHA1 (patch-ad) = dd3a45da76f0d9e728240adacc01aa5251db0342
diff --git a/sysutils/gnome-settings-daemon/patches/patch-aa b/sysutils/gnome-settings-daemon/patches/patch-aa
deleted file mode 100644
index bb4e658ee17..00000000000
--- a/sysutils/gnome-settings-daemon/patches/patch-aa
+++ /dev/null
@@ -1,12 +0,0 @@
-$NetBSD: patch-aa,v 1.1.1.1 2008/04/11 19:12:09 drochner Exp $
-
---- plugins/typing-break/gsd-typing-break-manager.c.orig	2008-04-03 14:08:12.000000000 +0200
-+++ plugins/typing-break/gsd-typing-break-manager.c
-@@ -27,6 +27,7 @@
- #include <unistd.h>
- #include <string.h>
- #include <errno.h>
-+#include <signal.h>
- 
- #include <locale.h>
- 
diff --git a/sysutils/gnome-settings-daemon/patches/patch-ab b/sysutils/gnome-settings-daemon/patches/patch-ab
deleted file mode 100644
index fb3f6e38fe0..00000000000
--- a/sysutils/gnome-settings-daemon/patches/patch-ab
+++ /dev/null
@@ -1,46 +0,0 @@
-$NetBSD: patch-ab,v 1.2 2008/12/18 15:56:13 jmcneill Exp $
-
---- plugins/sound/gsd-sound-manager.c.orig	2008-11-24 18:02:41.000000000 -0500
-+++ plugins/sound/gsd-sound-manager.c
-@@ -21,6 +21,7 @@
- 
- #include "config.h"
- 
-+#include <sys/stat.h>
- #include <sys/types.h>
- #include <sys/wait.h>
- #include <stdlib.h>
-@@ -28,6 +29,7 @@
- #include <unistd.h>
- #include <string.h>
- #include <errno.h>
-+#include <signal.h>
- 
- #include <locale.h>
- 
-@@ -97,16 +99,24 @@ reset_esd_pid (GPid             pid,
- static gboolean
- start_gnome_sound (GsdSoundManager *manager)
- {
--        char    *argv[] = { ESD_LOCATION  "esd", "-nobeeps", NULL};
-+        char    **argv;
-+	char	*argv_esd[] = { ESD_LOCATION  "esd", "-nobeeps", NULL};
-+	char	*argv_esdcompat[] = { ESD_LOCATION  "esdcompat", "-nobeeps", NULL};
-         GError  *error;
-         gboolean res;
-         time_t   starttime;
-         gboolean ret;
-+	struct stat st;
- 
-         ret = FALSE;
- 
-         gnome_settings_profile_start (NULL);
- 
-+	if (stat (argv_esdcompat[0], &st) == 0)
-+		argv = argv_esdcompat;
-+	else
-+		argv = argv_esd;
-+
-         error = NULL;
-         res = g_spawn_async (NULL,
-                              argv,
diff --git a/sysutils/gnome-settings-daemon/patches/patch-ad b/sysutils/gnome-settings-daemon/patches/patch-ad
deleted file mode 100644
index c559919c882..00000000000
--- a/sysutils/gnome-settings-daemon/patches/patch-ad
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ad,v 1.1 2008/11/20 18:15:28 wiz Exp $
-
---- configure.orig	2008-11-20 17:52:52.000000000 +0000
-+++ configure
-@@ -27374,7 +27374,7 @@ fi
-        if test "x$GSD_ESD_LOCATION" != "x"; then
-            # Add slash so that if the ESD pkgconfig file does not
-            # specify esd_serverdir, g-s-d will look in the PATH
--           GSD_ESD_LOCATION="$GSD_ESD_LOCATION/"
-+           ESD_LOCATION="$GSD_ESD_LOCATION/"
-        fi
- fi
-