Update gnome-desktop3 to 3.10.2

===============
Version  3.10.1
===============

- gnome-bg: Fix memory leaks (#709271)
- gnome-bg: set error when parsing XML file that's not a slide show (#708877)
- languages: Obtain supported locales from "locale -a" output (#698383)
- thumbnailer: Bail if no pixbuf loader could be created (#709819)
- thumbnailer: Support loading thumbnails from remote locations (#708824)
- Translation updates

===============
Version  3.10.0
===============

- libsystem: Update from master ($708435)
- gnome-rr: refresh when mutter restarts (#708284)
- Translation updates

===============
Version  3.9.92
===============

- IdleMonitor: protect watches from being freed while in flight (#707396)
- thumbnailer: Always print errors from gs_file_read_noatime() (#699252)
- thumbnailer: Correctly check for errors (#699252)
- thumbnailer: Check gdk_pixbuf_loader_close()'s retval (#699252)
- Correct the transposed bits of the red chromacity in the EDID parser
- Translation updates

===============
Version  3.9.91
===============

- gnome-rr: don't assume 'default' means built-in (#706738)
- gnome-rr: Read back new backlight value after changes (#706729)
- idle: Use mutter api instead of direct X clals (#706006)
- Translation updates

===============
Version  3.9.90
===============

- gnome-rr: Add api to get physical size
- gnome-rr: Add async constructor
- gnome-rr: Port to mutter dbus api (#705510)
- xkb: Prevent a crash (#705885)
- Translation updates

==============
Version  3.9.5
==============

- xkb: Ensure strings are UTF-8
- gnome-rr: Fix a crash
- gnome-rr: Be more careful when parsing EDID
- wall-clock: Initialize gettext
- gnome-bg: Objects without a filename are not slideshows
- gnome-xkb-info: Fix memory leaks
- Translation updates

==============
Version  3.9.1
==============

- gnome-xkb-info: Don't store duplicated layouts in locale tables
- idle-monitor: Make per-device monitor fallible
- wall-clock: Move ratio from msg id's to translations
- idle-monitor: Allow multiple watches per alarm
- Translation updates

==============
Version 3.7.90
==============

- Fix introspection generation for Vala
- Fix introspectability of GnomeBg

* GnomeIdleMonitor:
- Break ABI and API to fix reliance of the API on an Xorg bug
- use standard GObject boilerplate
- generate gtk-doc documentation

* GnomeWallClock:
- generate gtk-doc documentation
- add timezone property which can be monitored
- Add conventional gnome_wall_clock_new()

* GnomeXkbInfo:
- generate gtk-doc documentation
- Use the correct methods to get language/country
- Handle duplicated layouts
- Add API to get layouts for language and country

* gnome-languages:
- generate gtk-doc documentation
- Add methods to get language/country from ISO codes
- Add default input sources per locale

* GnomeRR:
- Make GnomeRRConfig use the detected display name
- use standard GObject boilerplate
- Improve gtk-doc documentation

* GnomeBg:
- Split slide show API to be usable from gnome-shell
- Add asynchronous version of slideshow loading

=============
Version 3.7.5
=============

 languages: Don't g_warning if there's no locale archive
 languages: Extracted from gnome-control-center
 languages: Fix a memory leak
 xkb-info: Group layouts by country and language
 xkb-info: Add a get_layout_info_for_locale method

Translation updates: Norwegian, Slovenian, Polish, Hebrew, Serbian

=============
Version 3.7.4
=============

 690703 wallclock: Fix AM/PM detection
 691701 GnomeRR: make DPMS take effect immediately
 wallclock: return a proper error when idle-counter unavailable

 Translation updates: Spanish, Polish, Norwegian bokmål, Arabic,
 Greek, Galician, Hebrew, Assamese, Friulian, Bulgarian, Slovenian,
 Uyghur

=============
Version 3.7.3
=============

 rr-labeler has been moved into gnome-control-center
 We use nice Unicode for date formatting now
 688227 idle-monitor: Reset the alarm so it can be triggered again

Translation updates: Kannada, Odia, Tamil

=============
Version 3.7.2
=============

Bug fixes:
 682224 Fix a memory leak in GnomeIdleMonitor
 682224 Support device-specific counters
 688189 Fix compiler warnings
 687913 Only use 12h mode when am/pm is available

Translation updates: Japanese
=============
Version 3.7.1
=============

Bug fixes:
 684814 rr-labeler: Improve drawing of monitor label
 684803 gnome-xkb-info: Add public api to get XKB option descriptions
 682224 Add GnomeIdleMonitor
 686792 Don't use gvfs-copy in autogen.sh

Translation updates: Aragonese, Catalan, Catalan (Valencian), Japanese,
Ukrainian, Uzbek

5 files changed, 31 insertions, 40 deletions

diff --git a/x11/gnome-desktop3/Makefile b/x11/gnome-desktop3/Makefile
index 27013d3d1bc..2f774f96ea9 100644
--- a/x11/gnome-desktop3/Makefile
+++ b/x11/gnome-desktop3/Makefile
@@ -1,11 +1,9 @@
-# $NetBSD: Makefile,v 1.15 2013/10/10 14:41:56 ryoon Exp $
-#
+# $NetBSD: Makefile,v 1.16 2014/02/12 01:23:33 prlw1 Exp $
 
-DISTNAME=	gnome-desktop-3.6.2
+DISTNAME=	gnome-desktop-3.10.2
 PKGNAME=	${DISTNAME:S/desktop/desktop3/}
-PKGREVISION=	6
 CATEGORIES=	x11 gnome
-MASTER_SITES=	${MASTER_SITE_GNOME:=sources/gnome-desktop/3.6/}
+MASTER_SITES=	${MASTER_SITE_GNOME:=sources/gnome-desktop/${PKGVERSION_NOREV:R}/}
 EXTRACT_SUFX=	.tar.xz
 
 MAINTAINER=	prlw1@cam.ac.uk
@@ -28,15 +26,15 @@ CONFIGURE_ARGS+=	--disable-gtk-doc
 
 BUILD_DEPENDS+=		itstool-[0-9]*:../../textproc/itstool
 
-BUILDLINK_API_DEPENDS.glib2+=	glib2>=2.33.3
+BUILDLINK_API_DEPENDS.glib2+=	glib2>=2.35.0
 .include "../../devel/glib2/buildlink3.mk"
 .include "../../devel/gobject-introspection/buildlink3.mk"
-BUILDLINK_API_DEPENDS.gsettings-deskopt-schmemas+=	gsettings-deskopt-schmemas>=3.5.91
+BUILDLINK_API_DEPENDS.gsettings-desktop-schemas+=	gsettings-desktop-schemas>=3.5.91
 .include "../../sysutils/gsettings-desktop-schemas/buildlink3.mk"
+.include "../../textproc/iso-codes/buildlink3.mk"
 .include "../../x11/gtk3/buildlink3.mk"
 .include "../../x11/libXrandr/buildlink3.mk"
 .include "../../x11/libxkbfile/buildlink3.mk"
-.include "../../x11/startup-notification/buildlink3.mk"
 .include "../../x11/xkeyboard-config/buildlink3.mk"
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/x11/gnome-desktop3/PLIST b/x11/gnome-desktop3/PLIST
index 25280ef1188..42bb7fc4b7c 100644
--- a/x11/gnome-desktop3/PLIST
+++ b/x11/gnome-desktop3/PLIST
@@ -1,11 +1,12 @@
-@comment $NetBSD: PLIST,v 1.2 2012/10/29 14:29:27 prlw1 Exp $
+@comment $NetBSD: PLIST,v 1.3 2014/02/12 01:23:33 prlw1 Exp $
 include/gnome-desktop-3.0/libgnome-desktop/gnome-bg-crossfade.h
+include/gnome-desktop-3.0/libgnome-desktop/gnome-bg-slide-show.h
 include/gnome-desktop-3.0/libgnome-desktop/gnome-bg.h
 include/gnome-desktop-3.0/libgnome-desktop/gnome-desktop-thumbnail.h
-include/gnome-desktop-3.0/libgnome-desktop/gnome-desktop-utils.h
+include/gnome-desktop-3.0/libgnome-desktop/gnome-idle-monitor.h
+include/gnome-desktop-3.0/libgnome-desktop/gnome-languages.h
 include/gnome-desktop-3.0/libgnome-desktop/gnome-pnp-ids.h
 include/gnome-desktop-3.0/libgnome-desktop/gnome-rr-config.h
-include/gnome-desktop-3.0/libgnome-desktop/gnome-rr-labeler.h
 include/gnome-desktop-3.0/libgnome-desktop/gnome-rr.h
 include/gnome-desktop-3.0/libgnome-desktop/gnome-wall-clock.h
 include/gnome-desktop-3.0/libgnome-desktop/gnome-xkb-info.h
@@ -16,24 +17,33 @@ libexec/gnome-rr-debug
 share/gir-1.0/GnomeDesktop-3.0.gir
 share/gnome/gnome-version.xml
 share/gtk-doc/html/gnome-desktop3/GnomeDesktopThumbnailFactory.html
+share/gtk-doc/html/gnome-desktop3/GnomeIdleMonitor.html
+share/gtk-doc/html/gnome-desktop3/GnomeWallClock.html
+share/gtk-doc/html/gnome-desktop3/GnomeXkbInfo.html
 share/gtk-doc/html/gnome-desktop3/background.html
+share/gtk-doc/html/gnome-desktop3/gnome-desktop3-Language-Utilities.html
 share/gtk-doc/html/gnome-desktop3/gnome-desktop3-gnome-bg.html
-share/gtk-doc/html/gnome-desktop3/gnome-desktop3-gnome-desktop-utils.html
+share/gtk-doc/html/gnome-desktop3/gnome-desktop3-gnome-pnp-ids.html
 share/gtk-doc/html/gnome-desktop3/gnome-desktop3-gnome-rr-config.html
-share/gtk-doc/html/gnome-desktop3/gnome-desktop3-gnome-rr-labeler.html
 share/gtk-doc/html/gnome-desktop3/gnome-desktop3-gnome-rr.html
 share/gtk-doc/html/gnome-desktop3/gnome-desktop3.devhelp2
 share/gtk-doc/html/gnome-desktop3/home.png
+share/gtk-doc/html/gnome-desktop3/idle-monitor.html
 share/gtk-doc/html/gnome-desktop3/index.html
 share/gtk-doc/html/gnome-desktop3/index.sgml
 share/gtk-doc/html/gnome-desktop3/intro.html
+share/gtk-doc/html/gnome-desktop3/languages.html
+share/gtk-doc/html/gnome-desktop3/left-insensitive.png
 share/gtk-doc/html/gnome-desktop3/left.png
-share/gtk-doc/html/gnome-desktop3/libgnome.html
 share/gtk-doc/html/gnome-desktop3/randr.html
+share/gtk-doc/html/gnome-desktop3/right-insensitive.png
 share/gtk-doc/html/gnome-desktop3/right.png
 share/gtk-doc/html/gnome-desktop3/style.css
 share/gtk-doc/html/gnome-desktop3/thumbnail.html
+share/gtk-doc/html/gnome-desktop3/up-insensitive.png
 share/gtk-doc/html/gnome-desktop3/up.png
+share/gtk-doc/html/gnome-desktop3/wall-clock.html
+share/gtk-doc/html/gnome-desktop3/xkb-info.html
 share/libgnome-desktop-3.0/pnp.ids
 share/locale/af/LC_MESSAGES/gnome-desktop-3.0.mo
 share/locale/am/LC_MESSAGES/gnome-desktop-3.0.mo
@@ -59,6 +69,7 @@ share/locale/da/LC_MESSAGES/gnome-desktop-3.0.mo
 share/locale/de/LC_MESSAGES/gnome-desktop-3.0.mo
 share/locale/dz/LC_MESSAGES/gnome-desktop-3.0.mo
 share/locale/el/LC_MESSAGES/gnome-desktop-3.0.mo
+share/locale/en/LC_MESSAGES/gnome-desktop-3.0.mo
 share/locale/en@shaw/LC_MESSAGES/gnome-desktop-3.0.mo
 share/locale/en_CA/LC_MESSAGES/gnome-desktop-3.0.mo
 share/locale/en_GB/LC_MESSAGES/gnome-desktop-3.0.mo
@@ -130,6 +141,7 @@ share/locale/sr@latin/LC_MESSAGES/gnome-desktop-3.0.mo
 share/locale/sv/LC_MESSAGES/gnome-desktop-3.0.mo
 share/locale/ta/LC_MESSAGES/gnome-desktop-3.0.mo
 share/locale/te/LC_MESSAGES/gnome-desktop-3.0.mo
+share/locale/tg/LC_MESSAGES/gnome-desktop-3.0.mo
 share/locale/th/LC_MESSAGES/gnome-desktop-3.0.mo
 share/locale/tk/LC_MESSAGES/gnome-desktop-3.0.mo
 share/locale/tr/LC_MESSAGES/gnome-desktop-3.0.mo
diff --git a/x11/gnome-desktop3/buildlink3.mk b/x11/gnome-desktop3/buildlink3.mk
index 0396af03bb4..2b569bbcd79 100644
--- a/x11/gnome-desktop3/buildlink3.mk
+++ b/x11/gnome-desktop3/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.13 2013/10/10 14:41:56 ryoon Exp $
+# $NetBSD: buildlink3.mk,v 1.14 2014/02/12 01:23:33 prlw1 Exp $
 
 BUILDLINK_TREE+=	gnome-desktop3
 
@@ -11,7 +11,6 @@ BUILDLINK_PKGSRCDIR.gnome-desktop3?=	../../x11/gnome-desktop3
 
 .include "../../x11/gtk3/buildlink3.mk"
 .include "../../x11/libxkbfile/buildlink3.mk"
-.include "../../x11/startup-notification/buildlink3.mk"
 .endif # GNOME_DESKTOP_BUILDLINK3_MK
 
 BUILDLINK_TREE+=	-gnome-desktop3
diff --git a/x11/gnome-desktop3/distinfo b/x11/gnome-desktop3/distinfo
index 24d1c799300..5f00f812728 100644
--- a/x11/gnome-desktop3/distinfo
+++ b/x11/gnome-desktop3/distinfo
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.4 2012/11/23 17:21:00 drochner Exp $
+$NetBSD: distinfo,v 1.5 2014/02/12 01:23:33 prlw1 Exp $
 
-SHA1 (gnome-desktop-3.6.2.tar.xz) = b5a8f4a008bc36f9310ee9d943a0070a2373cb38
-RMD160 (gnome-desktop-3.6.2.tar.xz) = 9795c6717a9a4098d850fa3dbe32fed2e136c02d
-Size (gnome-desktop-3.6.2.tar.xz) = 978108 bytes
-SHA1 (patch-aa) = a3ac659a29a12aee1c758959baabef480542576d
+SHA1 (gnome-desktop-3.10.2.tar.xz) = fd13640ad7f096f29267366bcdf4cf8dc95af07a
+RMD160 (gnome-desktop-3.10.2.tar.xz) = 9d59c58c497eafa75a5ae7a38edaa740c8c77726
+Size (gnome-desktop-3.10.2.tar.xz) = 1062876 bytes
+SHA1 (patch-aa) = 0553828a17b36a1a7ce2fb66ed1ae0ce6eaa8075
diff --git a/x11/gnome-desktop3/patches/patch-aa b/x11/gnome-desktop3/patches/patch-aa
index dfbef1391f2..d5ae51208e4 100644
--- a/x11/gnome-desktop3/patches/patch-aa
+++ b/x11/gnome-desktop3/patches/patch-aa
@@ -1,27 +1,9 @@
-$NetBSD: patch-aa,v 1.1 2012/08/23 18:15:38 drochner Exp $
+$NetBSD: patch-aa,v 1.2 2014/02/12 01:23:33 prlw1 Exp $
 
 allow 64-bit time_t on 32-bit system
 
 --- libgnome-desktop/gnome-desktop-thumbnail.c.orig	2012-08-23 17:49:46.000000000 +0000
 +++ libgnome-desktop/gnome-desktop-thumbnail.c
-@@ -1382,7 +1382,7 @@ gnome_desktop_thumbnail_factory_save_thu
-     }
-   close (tmp_fd);
-   
--  g_snprintf (mtime_str, 21, "%ld",  original_mtime);
-+  g_snprintf (mtime_str, 21, "%lld",  (long long)original_mtime);
-   width = gdk_pixbuf_get_option (thumbnail, "tEXt::Thumb::Image::Width");
-   height = gdk_pixbuf_get_option (thumbnail, "tEXt::Thumb::Image::Height");
- 
-@@ -1484,7 +1484,7 @@ gnome_desktop_thumbnail_factory_create_f
-     }
-   close (tmp_fd);
-   
--  g_snprintf (mtime_str, 21, "%ld",  mtime);
-+  g_snprintf (mtime_str, 21, "%lld",  (long long)mtime);
-   pixbuf = gdk_pixbuf_new (GDK_COLORSPACE_RGB, TRUE, 8, 1, 1);
-   saved_ok  = gdk_pixbuf_save (pixbuf,
- 			       tmp_path,
 @@ -1613,7 +1613,7 @@ gnome_desktop_thumbnail_is_valid (GdkPix
    thumb_mtime_str = gdk_pixbuf_get_option (pixbuf, "tEXt::Thumb::MTime");
    if (!thumb_mtime_str)