Update gnome-desktop to 2.25.92.

===============
Version 2.25.92
===============

  libgnome-desktop

	* GnomeBG: Allow apps to ignore a pending change so they can avoid
	  updating their background twice (Alexander Larsson)
	* GnomeBG: Blow all expensive caches if we're not gonna update the
	  background again in one minute (Alexander Larsson)
	* GnomeBG: Do slightly less steps in slide transitions to avoid using
	  to much resources on things that are not visible (Alexander Larsson)
	* GnomeBG: Remove outstanding transitions on finalize (Alexander
	  Larsson)
	* GnomeRR: Use g_new0() instead of calloc() for consistency (Federico
	  Mena Quintero)
	* GnomeRR: Fix leak (Federico Mena Quintero)
	* GnomeRR: Code cleanup (Federico Mena Quintero)
	* GnomeRR: Revert the change to use XRRGetScreenResourcesCurrent(),
	  it's not needed anymore and it broke the "Detect Monitors" button
	  (Matthias Clasen)
	* General: Make sure that the translation system is initiliazed so that
	  translations can be used (Vincent)

  Doc Translations

	* Joan Duran (ca)

  Translators

	* Ihar Hrachyshka (be@latin)
	* Reşat SABIQ (crh)
	* David Lodge (en_GB)
	* Luca Ferretti (it)
	* Praveen Arimbrathodiyil (ml)
	* Manoj Kumar Giri (or)
	* Duarte Loreto (pt)
	* Adi Roiban (ro)

===============
Version 2.25.91
===============

  Doc Translations

	* Inaki Larranaga Murgoitio (eu)

  Translators

	* Xuacu (ast)
	* Alexander Shopov (bg)
	* Per Kongstad (da)
	* Dawa pemo (dz)
	* Simos Xenitellis (el)
	* Jorge González (es)
	* Iñaki Larrañaga Murgoitio (eu)
	* Farzaneh Sarafraz (fa)
	* Sweta Kothari (gu)
	* Rajesh Ranjan (hi)
	* Takeshi AIHANA (ja)
	* Vladimer Sichinava ვლადიმერ სიჭინავა (ka)
	* Raivis Dejus (lv)
	* Jovan Naumovski (mk)
	* Wouter Bolsterlee (nl)
	* Tomasz Dominikowski (pl)
	* Adi Roiban (ro)
	* Steve Murphy (rw)
	* Daniel Nylander (sv)
	* Theppitak Karoonboonyanan (th)
	* Nurali Abdurahmonov (uz)
	* Clytie Siddall (vi)
	* 甘露(Gan Lu) (zh_CN)
	* Chao-Hsiung Liao (zh_HK)
	* Chao-Hsiung Liao (zh_TW)

===============
Version 2.25.90
===============

  libgnome-desktop

	* GnomeRR: Create a backup file of the configuration when saving
	  (Federico Mena Quintero)
	* GnomeRR: Add public API to get to $(XDG_CONFIG_HOME)/monitors.xml and
	  a backup of that file (Federico Mena Quintero)
	* GnomeRR: Add gnome_rr_config_apply_from_filename() (Federico Mena
	  Quintero)
	* GnomeRR: Deprecate gnome_rr_config_apply_stored() (Federico Mena
	  Quintero)

  Translators

	* Jordi Mallach (ca)
	* Ilkka Tuohela (fi)
	* Gabor Kelemen (hu)
	* Changwoo Ryu (ko)
	* Gintautas Miliauskas (lt)
	* Raivis Dejus (lv)
	* Manoj Kumar Giri (or)

==============
Version 2.25.5
==============

  libgnome-desktop

	* GnomeBG: use gdk_color_equal() instead of custom function (Vincent)
	* GnomeRR: use XRRGetScreenResourcesCurrent instead of
	  XRRGetScreenResources when available (xrandr 1.3) because it's
	  cheaper (Alberto Milone)
	* GnomeBG: emit "transitioned" signal instead of "changed" signal for
	  new frames in a slideshow background (Ray Strode)
	* GnomeBG: reorganize code a bit (Ray Strode)
	* GnomeBG: add fading API to support fading between two backgrounds
	  (Ray Strode)

  Translators

	* saudat mohammed (ha)
	* Onye, Sylvester (ig)
	* Djavan Fagundes (pt_BR)
	* Nurali Abdurahmonov (uz@cyrillic)
	* Nurali Abdurahmonov (uz)
	* Sunday Ayo Fajuyitan (yo)

==============
Version 2.25.4
==============

  Translators

	* Jorge González (es)
	* Claude Paroz (fr)
	* Gil Osher (he)
	* 甘露(Gan Lu) (zh_CN)

==============
Version 2.25.3
==============

Note to distributors: the API break is in GnomeRR.

  libgnome-desktop

	* GnomeRR: plug leaks (Matthias Clasen)
	* GnomeRR: add API-breaking error reporting API (Federico Mena
	  Quintero)
	* GnomeBG: fix potential crash with some empty slideshow (Vincent)
	* Build fixes (Vincent)

  Translators

	* Gil Osher (he)
	* Luca Ferretti (it)
	* Kjartan Maraas (nb)

==============
Version 2.25.2
==============

  libgnome-desktop

	* GnomeDesktopThumbnail: reenable check for preview::icon (Vincent)
	* GnomeRR: add Lenovo display name (Søren Sandmann)
	* GnomeBG: plug a leak (Cosimo Cecchi)
	* GnomeDesktopThumbnail: fix potential crash when a temporary file
	  cannot be created (Vincent)

  Misc

	* Require glib 2.19.1 (Vincent)
	* Update a bit API documentation (Vincent)
	* Require GTK+ 2.14.0 (Vincent)

  Translators

	* Jorge González (es)
	* Daniel Nylander (sv)

================
Version 2.25.1.1
================

Quick release to not depend on an unreleased glib.

  libgnome-desktop

	* GnomeDesktopThumbnail: disable check for preview::icon, since it's
	  not available in glib 2.18 (Vincent)

  Misc

	* Require glib 2.18 instead of 2.19 (Vincent)

==============
Version 2.25.1
==============

Note: this release breaks API and ABI, so we can stop depending on libgnome.
We also lose backwards compatibility for GNOME 1 and KDE 2 icons in desktop
files in GnomeDesktopItem (GKeyFile doesn't support this anyway).

  libgnome-desktop

	* Remove all libgnome usage (Alex Larsson)
	* GnomeDesktopThumbnail: new, copied from libgnome* (Alex Larsson)
	* Add gnome_desktop_prepend_terminal_to_vector(), copied from libgnome
	  (Alex Larsson)
	* Remove GnomeDItemEdit and GnomeHint objects (Alex Larsson)
	* GnomeRR: new API to support fn-F7 (Søren Sandmann)
	* GnomeBG: use foreign_new_for_screen() instead of _foreign_new()
	  (Roland Dreier)
	* GnomeDesktopThumbnail: Check for preview::icon for fast backend-side
	  thumbnails (David Zeuthen)

  Misc

	* Remove dependencies on libxml and libgnome*
	* Require glib 2.19

  Doc Translations

	* Gabor Kelemen (hu)

  Translators

	* Astur (ast)
	* Margulan Moldabekov (kk)

6 files changed, 43 insertions, 310 deletions

diff --git a/x11/gnome-desktop/Makefile b/x11/gnome-desktop/Makefile
index e8a28a60b7f..825316a6d68 100644
--- a/x11/gnome-desktop/Makefile
+++ b/x11/gnome-desktop/Makefile
@@ -1,10 +1,9 @@
-# $NetBSD: Makefile,v 1.87 2009/02/09 22:56:28 joerg Exp $
+# $NetBSD: Makefile,v 1.88 2009/03/16 12:35:59 jmcneill Exp $
 #
 
-DISTNAME=		gnome-desktop-2.24.3
-PKGREVISION=		1
+DISTNAME=		gnome-desktop-2.25.92
 CATEGORIES=		x11 gnome
-MASTER_SITES=		${MASTER_SITE_GNOME:=sources/gnome-desktop/2.24/}
+MASTER_SITES=		${MASTER_SITE_GNOME:=sources/gnome-desktop/2.25/}
 EXTRACT_SUFX=		.tar.bz2
 
 MAINTAINER=		drochner@NetBSD.org
@@ -35,11 +34,10 @@ post-install:
 	${INSTALL_DATA} ${FILESDIR}/${f} ${DESTDIR}${PREFIX}/share/pixmaps/${f}
 .endfor
 
+.include "../../devel/GConf/buildlink3.mk"
 BUILDLINK_API_DEPENDS.glib2+=	glib2>=2.15.4
 .include "../../devel/glib2/buildlink3.mk"
-.include "../../devel/libgnomeui/buildlink3.mk"
 .include "../../devel/gettext-lib/buildlink3.mk"
-.include "../../graphics/libgnomecanvas/buildlink3.mk"
 .include "../../textproc/gnome-doc-utils/buildlink3.mk"
 .include "../../mk/omf-scrollkeeper.mk"
 BUILDLINK_API_DEPENDS.gtk2+=	gtk2+>=2.11.3
diff --git a/x11/gnome-desktop/PLIST b/x11/gnome-desktop/PLIST
index 0e227783d72..8366b6693bd 100644
--- a/x11/gnome-desktop/PLIST
+++ b/x11/gnome-desktop/PLIST
@@ -1,9 +1,10 @@
-@comment $NetBSD: PLIST,v 1.32 2008/12/02 14:37:19 wiz Exp $
+@comment $NetBSD: PLIST,v 1.33 2009/03/16 12:35:59 jmcneill Exp $
 bin/gnome-about
 include/gnome-desktop-2.0/libgnome/gnome-desktop-item.h
+include/gnome-desktop-2.0/libgnome/gnome-desktop-utils.h
+include/gnome-desktop-2.0/libgnomeui/gnome-bg-crossfade.h
 include/gnome-desktop-2.0/libgnomeui/gnome-bg.h
-include/gnome-desktop-2.0/libgnomeui/gnome-ditem-edit.h
-include/gnome-desktop-2.0/libgnomeui/gnome-hint.h
+include/gnome-desktop-2.0/libgnomeui/gnome-desktop-thumbnail.h
 include/gnome-desktop-2.0/libgnomeui/gnome-rr-config.h
 include/gnome-desktop-2.0/libgnomeui/gnome-rr-labeler.h
 include/gnome-desktop-2.0/libgnomeui/gnome-rr.h
@@ -28,6 +29,7 @@ share/gnome/help/fdl/C/fdl.xml
 share/gnome/help/fdl/ar/fdl.xml
 share/gnome/help/fdl/de/fdl.xml
 share/gnome/help/fdl/es/fdl.xml
+share/gnome/help/fdl/eu/fdl.xml
 share/gnome/help/fdl/fr/fdl.xml
 share/gnome/help/fdl/hu/fdl.xml
 share/gnome/help/fdl/ko/fdl.xml
@@ -41,6 +43,7 @@ share/gnome/help/gpl/ca/gpl.xml
 share/gnome/help/gpl/cs/gpl.xml
 share/gnome/help/gpl/de/gpl.xml
 share/gnome/help/gpl/es/gpl.xml
+share/gnome/help/gpl/eu/gpl.xml
 share/gnome/help/gpl/fi/gpl.xml
 share/gnome/help/gpl/fr/gpl.xml
 share/gnome/help/gpl/hu/gpl.xml
@@ -55,6 +58,7 @@ share/gnome/help/lgpl/C/lgpl.xml
 share/gnome/help/lgpl/ar/lgpl.xml
 share/gnome/help/lgpl/de/lgpl.xml
 share/gnome/help/lgpl/es/lgpl.xml
+share/gnome/help/lgpl/eu/lgpl.xml
 share/gnome/help/lgpl/fi/lgpl.xml
 share/gnome/help/lgpl/fr/lgpl.xml
 share/gnome/help/lgpl/hu/lgpl.xml
@@ -65,10 +69,17 @@ share/gnome/help/lgpl/sv/lgpl.xml
 share/gnome/help/lgpl/uk/lgpl.xml
 share/gnome/help/lgpl/vi/lgpl.xml
 share/gnome/help/lgpl/zh_CN/lgpl.xml
-share/gtk-doc/html/gnome-desktop/GnomeDItemEdit.html
-share/gtk-doc/html/gnome-desktop/GnomeHint.html
-share/gtk-doc/html/gnome-desktop/ch01.html
+share/gtk-doc/html/gnome-desktop/GnomeBG.html
+share/gtk-doc/html/gnome-desktop/GnomeDesktopThumbnailFactory.html
+share/gtk-doc/html/gnome-desktop/GnomeRRLabeler.html
+share/gtk-doc/html/gnome-desktop/background.html
 share/gtk-doc/html/gnome-desktop/gnome-desktop-GnomeDesktopItem.html
+share/gtk-doc/html/gnome-desktop/gnome-desktop-Miscellaneous-Functions.html
+share/gtk-doc/html/gnome-desktop/gnome-desktop-gnome-rr-config.html
+share/gtk-doc/html/gnome-desktop/gnome-desktop-gnome-rr-crtc.html
+share/gtk-doc/html/gnome-desktop/gnome-desktop-gnome-rr-mode.html
+share/gtk-doc/html/gnome-desktop/gnome-desktop-gnome-rr-output.html
+share/gtk-doc/html/gnome-desktop/gnome-desktop-gnome-rr-screen.html
 share/gtk-doc/html/gnome-desktop/gnome-desktop.devhelp
 share/gtk-doc/html/gnome-desktop/gnome-desktop.devhelp2
 share/gtk-doc/html/gnome-desktop/home.png
@@ -76,8 +87,11 @@ share/gtk-doc/html/gnome-desktop/index.html
 share/gtk-doc/html/gnome-desktop/index.sgml
 share/gtk-doc/html/gnome-desktop/intro.html
 share/gtk-doc/html/gnome-desktop/left.png
+share/gtk-doc/html/gnome-desktop/libgnome.html
+share/gtk-doc/html/gnome-desktop/randr.html
 share/gtk-doc/html/gnome-desktop/right.png
 share/gtk-doc/html/gnome-desktop/style.css
+share/gtk-doc/html/gnome-desktop/thumbnail.html
 share/gtk-doc/html/gnome-desktop/up.png
 share/locale/af/LC_MESSAGES/gnome-desktop-2.0.mo
 share/locale/am/LC_MESSAGES/gnome-desktop-2.0.mo
@@ -92,6 +106,7 @@ share/locale/bn_IN/LC_MESSAGES/gnome-desktop-2.0.mo
 share/locale/br/LC_MESSAGES/gnome-desktop-2.0.mo
 share/locale/bs/LC_MESSAGES/gnome-desktop-2.0.mo
 share/locale/ca/LC_MESSAGES/gnome-desktop-2.0.mo
+share/locale/crh/LC_MESSAGES/gnome-desktop-2.0.mo
 share/locale/cs/LC_MESSAGES/gnome-desktop-2.0.mo
 share/locale/cy/LC_MESSAGES/gnome-desktop-2.0.mo
 share/locale/da/LC_MESSAGES/gnome-desktop-2.0.mo
@@ -117,10 +132,12 @@ share/locale/hr/LC_MESSAGES/gnome-desktop-2.0.mo
 share/locale/hu/LC_MESSAGES/gnome-desktop-2.0.mo
 share/locale/hy/LC_MESSAGES/gnome-desktop-2.0.mo
 share/locale/id/LC_MESSAGES/gnome-desktop-2.0.mo
+share/locale/ig/LC_MESSAGES/gnome-desktop-2.0.mo
 share/locale/is/LC_MESSAGES/gnome-desktop-2.0.mo
 share/locale/it/LC_MESSAGES/gnome-desktop-2.0.mo
 share/locale/ja/LC_MESSAGES/gnome-desktop-2.0.mo
 share/locale/ka/LC_MESSAGES/gnome-desktop-2.0.mo
+share/locale/kk/LC_MESSAGES/gnome-desktop-2.0.mo
 share/locale/kn/LC_MESSAGES/gnome-desktop-2.0.mo
 share/locale/ko/LC_MESSAGES/gnome-desktop-2.0.mo
 share/locale/ku/LC_MESSAGES/gnome-desktop-2.0.mo
@@ -166,6 +183,7 @@ share/locale/tr/LC_MESSAGES/gnome-desktop-2.0.mo
 share/locale/ug/LC_MESSAGES/gnome-desktop-2.0.mo
 share/locale/uk/LC_MESSAGES/gnome-desktop-2.0.mo
 share/locale/ur/LC_MESSAGES/gnome-desktop-2.0.mo
+share/locale/uz/LC_MESSAGES/gnome-desktop-2.0.mo
 share/locale/uz@cyrillic/LC_MESSAGES/gnome-desktop-2.0.mo
 share/locale/vi/LC_MESSAGES/gnome-desktop-2.0.mo
 share/locale/wa/LC_MESSAGES/gnome-desktop-2.0.mo
@@ -180,6 +198,7 @@ share/omf/fdl/fdl-C.omf
 share/omf/fdl/fdl-ar.omf
 share/omf/fdl/fdl-de.omf
 share/omf/fdl/fdl-es.omf
+share/omf/fdl/fdl-eu.omf
 share/omf/fdl/fdl-fr.omf
 share/omf/fdl/fdl-hu.omf
 share/omf/fdl/fdl-ko.omf
@@ -193,6 +212,7 @@ share/omf/gpl/gpl-ca.omf
 share/omf/gpl/gpl-cs.omf
 share/omf/gpl/gpl-de.omf
 share/omf/gpl/gpl-es.omf
+share/omf/gpl/gpl-eu.omf
 share/omf/gpl/gpl-fi.omf
 share/omf/gpl/gpl-fr.omf
 share/omf/gpl/gpl-hu.omf
@@ -207,6 +227,7 @@ share/omf/lgpl/lgpl-C.omf
 share/omf/lgpl/lgpl-ar.omf
 share/omf/lgpl/lgpl-de.omf
 share/omf/lgpl/lgpl-es.omf
+share/omf/lgpl/lgpl-eu.omf
 share/omf/lgpl/lgpl-fi.omf
 share/omf/lgpl/lgpl-fr.omf
 share/omf/lgpl/lgpl-hu.omf
@@ -307,6 +328,7 @@ share/pixmaps/vnterm.xpm
 @dirrm share/gnome/help/lgpl/hu
 @dirrm share/gnome/help/lgpl/fr
 @dirrm share/gnome/help/lgpl/fi
+@dirrm share/gnome/help/lgpl/eu
 @dirrm share/gnome/help/lgpl/es
 @dirrm share/gnome/help/lgpl/de
 @dirrm share/gnome/help/lgpl/ar
@@ -322,6 +344,7 @@ share/pixmaps/vnterm.xpm
 @dirrm share/gnome/help/gpl/hu
 @dirrm share/gnome/help/gpl/fr
 @dirrm share/gnome/help/gpl/fi
+@dirrm share/gnome/help/gpl/eu
 @dirrm share/gnome/help/gpl/es
 @dirrm share/gnome/help/gpl/de
 @dirrm share/gnome/help/gpl/cs
@@ -336,13 +359,16 @@ share/pixmaps/vnterm.xpm
 @dirrm share/gnome/help/fdl/ko
 @dirrm share/gnome/help/fdl/hu
 @dirrm share/gnome/help/fdl/fr
+@dirrm share/gnome/help/fdl/eu
 @dirrm share/gnome/help/fdl/es
 @dirrm share/gnome/help/fdl/de
 @dirrm share/gnome/help/fdl/ar
 @comment in gnome2-dirs: @dirrm share/gnome/help/fdl/C
 @comment in gnome2-dirs: @dirrm share/gnome/help/fdl
+@comment in gnome2-dirs: @dirrm share/gnome/help
 @dirrm share/gnome-about/headers
 @dirrm share/gnome-about
+@comment in gnome2-dirs: @dirrm share/gnome
 @comment in xdg-dirs: @dirrm share/applications
 @dirrm include/gnome-desktop-2.0/libgnomeui
 @dirrm include/gnome-desktop-2.0/libgnome
diff --git a/x11/gnome-desktop/buildlink3.mk b/x11/gnome-desktop/buildlink3.mk
index 1eec68f92c2..29c54a5926a 100644
--- a/x11/gnome-desktop/buildlink3.mk
+++ b/x11/gnome-desktop/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.26 2008/03/06 14:53:56 wiz Exp $
+# $NetBSD: buildlink3.mk,v 1.27 2009/03/16 12:35:59 jmcneill Exp $
 
 BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
 GNOME_DESKTOP_BUILDLINK3_MK:=	${GNOME_DESKTOP_BUILDLINK3_MK}+
@@ -12,15 +12,12 @@ BUILDLINK_PACKAGES+=	gnome-desktop
 BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}gnome-desktop
 
 .if !empty(GNOME_DESKTOP_BUILDLINK3_MK:M+)
-BUILDLINK_API_DEPENDS.gnome-desktop+=	gnome-desktop>=2.14.0
-BUILDLINK_ABI_DEPENDS.gnome-desktop?=	gnome-desktop>=2.20.3nb1
+BUILDLINK_API_DEPENDS.gnome-desktop+=	gnome-desktop>=2.25.3
+BUILDLINK_ABI_DEPENDS.gnome-desktop?=	gnome-desktop>=2.25.1
 BUILDLINK_PKGSRCDIR.gnome-desktop?=	../../x11/gnome-desktop
 .endif	# GNOME_DESKTOP_BUILDLINK3_MK
 
 .include "../../devel/gettext-lib/buildlink3.mk"
-.include "../../devel/libgnomeui/buildlink3.mk"
-.include "../../graphics/libgnomecanvas/buildlink3.mk"
-.include "../../sysutils/gnome-vfs/buildlink3.mk"
 .include "../../x11/gtk2/buildlink3.mk"
 .include "../../x11/startup-notification/buildlink3.mk"
 
diff --git a/x11/gnome-desktop/distinfo b/x11/gnome-desktop/distinfo
index 7be010a1978..1aa5d68ac37 100644
--- a/x11/gnome-desktop/distinfo
+++ b/x11/gnome-desktop/distinfo
@@ -1,8 +1,6 @@
-$NetBSD: distinfo,v 1.42 2009/01/25 21:31:37 sketch Exp $
+$NetBSD: distinfo,v 1.43 2009/03/16 12:35:59 jmcneill Exp $
 
-SHA1 (gnome-desktop-2.24.3.tar.bz2) = 2ebbf2475bb741131b523819fb46e71d4489fa79
-RMD160 (gnome-desktop-2.24.3.tar.bz2) = b6489965a0baa6056b5c7826418401459ffbf0b9
-Size (gnome-desktop-2.24.3.tar.bz2) = 1509505 bytes
-SHA1 (patch-aa) = fda773406b65daa8e2e2ed29a43cd743040510fd
-SHA1 (patch-ab) = bf01d0f36c78913842687468001ea2c2edfb67aa
+SHA1 (gnome-desktop-2.25.92.tar.bz2) = 50ae0371ee21aff80b9fa620f5234ad34c6f7dce
+RMD160 (gnome-desktop-2.25.92.tar.bz2) = d41a9ad41948d9215afeef43cac43576e583aeb9
+Size (gnome-desktop-2.25.92.tar.bz2) = 3179825 bytes
 SHA1 (patch-ac) = 0aa17a12614e2220ed8dddf1d6543ae215da3fc9
diff --git a/x11/gnome-desktop/patches/patch-aa b/x11/gnome-desktop/patches/patch-aa
deleted file mode 100644
index 48ffb4ad511..00000000000
--- a/x11/gnome-desktop/patches/patch-aa
+++ /dev/null
@@ -1,22 +0,0 @@
-$NetBSD: patch-aa,v 1.3 2008/12/24 02:38:18 jmcneill Exp $
-
---- configure.in.orig	2008-11-25 08:09:10.000000000 -0500
-+++ configure.in	2008-12-23 21:12:14.000000000 -0500
-@@ -117,6 +117,17 @@
- AC_SUBST(XLIB_CFLAGS)
- AC_SUBST(XLIB_LIBS)
- 
-+AC_CHECK_DECLS([XRRQueryExtension], , ,
-+  [[
-+    #include <X11/Xlib.h>
-+    #include <X11/extensions/Xrandr.h>
-+  ]])
-+AC_CHECK_DECLS([XRRGetScreenSizeRange], , ,
-+  [[
-+    #include <X11/Xlib.h>
-+    #include <X11/extensions/Xrandr.h>
-+  ]])
-+
- dnl pkg-config dependency checks
- 
- PKG_CHECK_MODULES(GNOME_DESKTOP, libxml-2.0 >= $LIBXML_REQUIRED gdk-pixbuf-2.0 >= $GDK_PIXBUF_REQUIRED gtk+-2.0 >= $GTK_REQUIRED glib-2.0 >= $GLIB_REQUIRED gio-2.0 >= $GLIB_REQUIRED libgnomeui-2.0 >= $LIBGNOMEUI_REQUIRED gconf-2.0 >= $GCONF_REQUIRED $STARTUP_NOTIFICATION_PACKAGE)
diff --git a/x11/gnome-desktop/patches/patch-ab b/x11/gnome-desktop/patches/patch-ab
deleted file mode 100644
index d708c0b0979..00000000000
--- a/x11/gnome-desktop/patches/patch-ab
+++ /dev/null
@@ -1,264 +0,0 @@
-$NetBSD: patch-ab,v 1.3 2008/12/24 02:38:18 jmcneill Exp $
-
---- libgnome-desktop/gnome-rr.c.orig	2008-12-23 21:17:22.000000000 -0500
-+++ libgnome-desktop/gnome-rr.c	2008-12-23 21:30:26.000000000 -0500
-@@ -34,6 +34,11 @@
- 
- #define DISPLAY(o) ((o)->info->screen->xdisplay)
- 
-+#include "config.h"
-+#if HAVE_DECL_XRRGETSCREENSIZERANGE > 0
-+#define HAVE_XRANDR12
-+#endif
-+
- typedef struct ScreenInfo ScreenInfo;
- 
- struct ScreenInfo
-@@ -43,7 +48,9 @@ struct ScreenInfo
-     int			min_height;
-     int			max_height;
- 
-+#ifdef HAVE_XRANDR12
-     XRRScreenResources *resources;
-+#endif
-     
-     GnomeRROutput **	outputs;
-     GnomeRRCrtc **	crtcs;
-@@ -70,7 +77,9 @@ struct GnomeRRScreen
- struct GnomeRROutput
- {
-     ScreenInfo *	info;
-+#ifdef HAVE_XRANDR12
-     RROutput		id;
-+#endif
-     
-     char *		name;
-     GnomeRRCrtc *	current_crtc;
-@@ -86,13 +95,17 @@ struct GnomeRROutput
- 
- struct GnomeRROutputWrap
- {
-+#ifdef HAVE_XRANDR12
-     RROutput		id;
-+#endif
- };
- 
- struct GnomeRRCrtc
- {
-     ScreenInfo *	info;
-+#ifdef HAVE_XRANDR12
-     RRCrtc		id;
-+#endif
-     
-     GnomeRRMode *	current_mode;
-     GnomeRROutput **	current_outputs;
-@@ -107,13 +120,16 @@ struct GnomeRRCrtc
- struct GnomeRRMode
- {
-     ScreenInfo *	info;
-+#ifdef HAVE_XRANDR12
-     RRMode		id;
-+#endif
-     char *		name;
-     int			width;
-     int			height;
-     int			freq;		/* in mHz */
- };
- 
-+#ifdef HAVE_XRANDR12
- /* GnomeRRCrtc */
- static GnomeRRCrtc *  crtc_new          (ScreenInfo         *info,
- 					 RRCrtc              id);
-@@ -135,7 +151,6 @@ static void           mode_initialize   
- 					 XRRModeInfo        *info);
- static void           mode_free         (GnomeRRMode        *mode);
- 
--
- /* Screen */
- static GnomeRROutput *
- gnome_rr_output_by_id (ScreenInfo *info, RROutput id)
-@@ -410,6 +425,7 @@ screen_on_event (GdkXEvent *xevent,
-     /* Pass the event on to GTK+ */
-     return GDK_FILTER_CONTINUE;
- }
-+#endif
- 
- /* Returns NULL if screen could not be created.  For instance, if
-  * the driver does not support Xrandr 1.2.
-@@ -419,6 +435,7 @@ gnome_rr_screen_new (GdkScreen *gdk_scre
- 		     GnomeRRScreenChanged callback,
- 		     gpointer data)
- {
-+#ifdef HAVE_XRANDR12
-     Display *dpy = GDK_SCREEN_XDISPLAY (gdk_screen);
-     int event_base;
-     int ignore;
-@@ -460,12 +477,14 @@ gnome_rr_screen_new (GdkScreen *gdk_scre
- 	return screen;
-     }
-     
-+#endif /* !HAVE_XRANDR12 */
-     return NULL;
- }
- 
- void
- gnome_rr_screen_destroy (GnomeRRScreen *screen)
- {
-+#ifdef HAVE_XRANDR12
- 	g_return_if_fail (screen != NULL);
- 
- 	gdk_window_remove_filter (screen->gdk_root, screen_on_event, screen);
-@@ -474,6 +493,7 @@ gnome_rr_screen_destroy (GnomeRRScreen *
- 	screen->info = NULL;
- 
- 	g_free (screen);
-+#endif
- }
- 
- void
-@@ -483,10 +503,12 @@ gnome_rr_screen_set_size (GnomeRRScreen 
- 			  int       mm_width,
- 			  int       mm_height)
- {
-+#ifdef HAVE_XRANDR12
-     g_return_if_fail (screen != NULL);
-     
-     XRRSetScreenSize (screen->xdisplay, screen->xroot,
- 		      width, height, mm_width, mm_height);
-+#endif
- }
- 
- void
-@@ -514,7 +536,11 @@ gnome_rr_screen_get_ranges (GnomeRRScree
- gboolean
- gnome_rr_screen_refresh (GnomeRRScreen *screen)
- {
-+#ifdef HAVE_XRANDR12
-     return screen_update (screen, FALSE);
-+#else
-+    return FALSE;
-+#endif
- }
- 
- GnomeRRMode **
-@@ -553,11 +579,13 @@ gnome_rr_screen_get_crtc_by_id (GnomeRRS
-     g_return_val_if_fail (screen != NULL, NULL);
-     g_return_val_if_fail (screen->info != NULL, NULL);
-     
-+#ifdef HAVE_XRANDR12
-     for (i = 0; screen->info->crtcs[i] != NULL; ++i)
-     {
- 	if (screen->info->crtcs[i]->id == id)
- 	    return screen->info->crtcs[i];
-     }
-+#endif
-     
-     return NULL;
- }
-@@ -571,15 +599,18 @@ gnome_rr_screen_get_output_by_id (GnomeR
-     g_return_val_if_fail (screen != NULL, NULL);
-     g_return_val_if_fail (screen->info != NULL, NULL);
-     
-+#ifdef HAVE_XRANDR12
-     for (i = 0; screen->info->outputs[i] != NULL; ++i)
-     {
- 	if (screen->info->outputs[i]->id == id)
- 	    return screen->info->outputs[i];
-     }
-+#endif
-     
-     return NULL;
- }
- 
-+#ifdef HAVE_XRANDR12
- /* GnomeRROutput */
- static GnomeRROutput *
- output_new (ScreenInfo *info, RROutput id)
-@@ -721,13 +752,18 @@ output_free (GnomeRROutput *output)
- {
-     g_free (output);
- }
-+#endif /* !HAVE_XRANDR12 */
- 
- guint32
- gnome_rr_output_get_id (GnomeRROutput *output)
- {
-     g_assert(output != NULL);
-     
-+#ifdef HAVE_XRANDR12
-     return output->id;
-+#else
-+    return 0;
-+#endif
- }
- 
- const guint8 *
-@@ -945,6 +981,7 @@ gnome_rr_crtc_set_config (GnomeRRCrtc   
- 	g_return_val_if_fail (y + mode->height <= info->max_height, FALSE);
-     }
-     
-+#ifdef HAVE_XRANDR12
-     output_ids = g_array_new (FALSE, FALSE, sizeof (RROutput));
-     
-     if (outputs)
-@@ -962,6 +999,9 @@ gnome_rr_crtc_set_config (GnomeRRCrtc   
- 			       output_ids->len) == RRSetConfigSuccess;
-     
-     g_array_free (output_ids, TRUE);
-+#else /* !HAVE_XRANDR12 */
-+    result = FALSE;
-+#endif
-     
-     return result;
- }
-@@ -979,7 +1019,11 @@ gnome_rr_crtc_get_id (GnomeRRCrtc *crtc)
- {
-     g_return_val_if_fail (crtc != NULL, 0);
-     
-+#ifdef HAVE_XRANDR12
-     return crtc->id;
-+#else
-+    return 0;
-+#endif
- }
- 
- gboolean
-@@ -1038,6 +1082,7 @@ gnome_rr_crtc_supports_rotation (GnomeRR
-     return (crtc->rotations & rotation);
- }
- 
-+#ifdef HAVE_XRANDR12
- static GnomeRRCrtc *
- crtc_new (ScreenInfo *info, RROutput id)
- {
-@@ -1123,12 +1168,17 @@ mode_new (ScreenInfo *info, RRMode id)
-     
-     return mode;
- }
-+#endif /* !HAVE_XRANDR12 */
- 
- guint32
- gnome_rr_mode_get_id (GnomeRRMode *mode)
- {
-     g_return_val_if_fail (mode != NULL, 0);
-+#ifdef HAVE_XRANDR12
-     return mode->id;
-+#else
-+    return 0;
-+#endif
- }
- 
- guint
-@@ -1152,6 +1202,7 @@ gnome_rr_mode_get_height (GnomeRRMode *m
-     return mode->height;
- }
- 
-+#ifdef HAVE_XRANDR12
- static void
- mode_initialize (GnomeRRMode *mode, XRRModeInfo *info)
- {
-@@ -1170,3 +1221,4 @@ mode_free (GnomeRRMode *mode)
-     g_free (mode->name);
-     g_free (mode);
- }
-+#endif /* !HAVE_XRANDR12 */