Update gnome-desktop3 to 3.14.1

- Fixed the build on systems lacking openat()
- Translation updates
- gnome-xkb-info: Fix some layouts not being associated to a locale
- gnome-rr: Add missing introspection annotations
- wall-clock: Add ref-tests for clock output
- wall-clock: Always use the ratio character (#726232)
- gnome-rr: Output the EDID vendor/product info as well
- gnome-rr: Add backlight output in debug
- thumbnailer: Try harder to create a failed thumbnail (#728775)
- Fix the build on OpenBSD
- gnome-rr: Improve debug output
- gnome-rr: Actually define output_get_possible_crtcs (#727034)
- gnome-rr: Initialize GnomeRROutputInfo:rotation to GNOME_RR_ROTATION_0 (#727023)
- Always set the DPMS mode when requested
- gnome-xkb-info: Remove xkbfile dependency (#719942) - API and ABI break
- gnome-xkb-info: Apply main layout locale metadata to variants (#711291)
- wall-clock: Replace ratio with colon on non-UTF-8 locales (#722664)
- more new gnome-rr api
- drop using glibc internal headers
- docs for thumbnailers
- idle monitor fixes
- use newer libgsystem internally
- gnome-rr: Improve debug output
- Add gnome_rr_output_get_min_backlight_step() API

9 files changed, 28 insertions, 906 deletions

diff --git a/x11/gnome-desktop3/Makefile b/x11/gnome-desktop3/Makefile
index eb7cc1c6d03..32abf38accf 100644
--- a/x11/gnome-desktop3/Makefile
+++ b/x11/gnome-desktop3/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.19 2014/09/21 04:43:51 prlw1 Exp $
+# $NetBSD: Makefile,v 1.20 2014/11/08 23:15:06 prlw1 Exp $
 
-DISTNAME=	gnome-desktop-3.10.2
+DISTNAME=	gnome-desktop-3.14.1
 PKGNAME=	${DISTNAME:S/desktop/desktop3/}
-PKGREVISION=	2
 CATEGORIES=	x11 gnome
 MASTER_SITES=	${MASTER_SITE_GNOME:=sources/gnome-desktop/${PKGVERSION_NOREV:R}/}
 EXTRACT_SUFX=	.tar.xz
@@ -22,12 +21,11 @@ PKGCONFIG_OVERRIDE+=	libgnome-desktop/gnome-desktop-3.0.pc.in
 CONFIGURE_ARGS+=	--with-gnome-distributor="The NetBSD Foundation"
 CONFIGURE_ARGS+=	--disable-date-in-gnome-version
 CONFIGURE_ARGS+=	--disable-desktop-docs
-CONFIGURE_ARGS+=	--disable-scrollkeeper
 CONFIGURE_ARGS+=	--disable-gtk-doc
 
 BUILD_DEPENDS+=		itstool-[0-9]*:../../textproc/itstool
 
-BUILDLINK_API_DEPENDS.glib2+=	glib2>=2.35.0
+BUILDLINK_API_DEPENDS.glib2+=	glib2>=2.38.0
 .include "../../devel/glib2/buildlink3.mk"
 .include "../../devel/gobject-introspection/buildlink3.mk"
 BUILDLINK_API_DEPENDS.gsettings-desktop-schemas+=	gsettings-desktop-schemas>=3.5.91
diff --git a/x11/gnome-desktop3/PLIST b/x11/gnome-desktop3/PLIST
index 42bb7fc4b7c..09f34628c41 100644
--- a/x11/gnome-desktop3/PLIST
+++ b/x11/gnome-desktop3/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.3 2014/02/12 01:23:33 prlw1 Exp $
+@comment $NetBSD: PLIST,v 1.4 2014/11/08 23:15:06 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
@@ -83,6 +83,7 @@ share/locale/fr/LC_MESSAGES/gnome-desktop-3.0.mo
 share/locale/fur/LC_MESSAGES/gnome-desktop-3.0.mo
 share/locale/fy/LC_MESSAGES/gnome-desktop-3.0.mo
 share/locale/ga/LC_MESSAGES/gnome-desktop-3.0.mo
+share/locale/gd/LC_MESSAGES/gnome-desktop-3.0.mo
 share/locale/gl/LC_MESSAGES/gnome-desktop-3.0.mo
 share/locale/gu/LC_MESSAGES/gnome-desktop-3.0.mo
 share/locale/ha/LC_MESSAGES/gnome-desktop-3.0.mo
diff --git a/x11/gnome-desktop3/buildlink3.mk b/x11/gnome-desktop3/buildlink3.mk
index 44f5b8d578e..114b4c26023 100644
--- a/x11/gnome-desktop3/buildlink3.mk
+++ b/x11/gnome-desktop3/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.15 2014/05/05 00:48:28 ryoon Exp $
+# $NetBSD: buildlink3.mk,v 1.16 2014/11/08 23:15:06 prlw1 Exp $
 
 BUILDLINK_TREE+=	gnome-desktop3
 
@@ -6,7 +6,7 @@ BUILDLINK_TREE+=	gnome-desktop3
 GNOME_DESKTOP3_BUILDLINK3_MK:=
 
 BUILDLINK_API_DEPENDS.gnome-desktop3+=	gnome-desktop3>=3.4.2
-BUILDLINK_ABI_DEPENDS.gnome-desktop3+=	gnome-desktop3>=3.10.2nb1
+BUILDLINK_ABI_DEPENDS.gnome-desktop3+=	gnome-desktop3>=3.14.0
 BUILDLINK_PKGSRCDIR.gnome-desktop3?=	../../x11/gnome-desktop3
 
 .include "../../x11/gtk3/buildlink3.mk"
diff --git a/x11/gnome-desktop3/distinfo b/x11/gnome-desktop3/distinfo
index 96caebe373e..d340325f9ed 100644
--- a/x11/gnome-desktop3/distinfo
+++ b/x11/gnome-desktop3/distinfo
@@ -1,10 +1,8 @@
-$NetBSD: distinfo,v 1.9 2014/09/25 15:10:21 prlw1 Exp $
+$NetBSD: distinfo,v 1.10 2014/11/08 23:15:06 prlw1 Exp $
 
-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) = 26bd3513ac6757ab1a406a8c40be37aa25c98ad4
-SHA1 (patch-configure) = febb8117f7d3b658d813679f0a95d46661e02147
-SHA1 (patch-libgnome-desktop_Makefile.in) = c8ff8fe775102aed193652f5569779a561bc3897
-SHA1 (patch-libgnome-desktop_libgsystem_gsystem-file-utils.c) = a67d29c3a5693cdc305e7826159fe29a21d12c0b
-SHA1 (patch-libgnome-desktop_libgsystem_gsystem-shutil.c) = ae279d6a60909284226853589470dc2e2c8363a9
+SHA1 (gnome-desktop-3.14.1.tar.xz) = a5544c4dbebf7acf84ba295be1a0f360b1937c2b
+RMD160 (gnome-desktop-3.14.1.tar.xz) = 013e5fe4961d3c83c2ae90b7039cf16237f2770e
+Size (gnome-desktop-3.14.1.tar.xz) = 1122552 bytes
+SHA1 (patch-aa) = 1d22c87b74aa554e4d9561cb5dcf0a8eae6b9e54
+SHA1 (patch-libgnome-desktop_libgsystem_gsystem-file-utils.c) = 0a4ab3e08c777e17e8809afeb8950b3a900e0c1a
+SHA1 (patch-libgnome-desktop_libgsystem_gsystem-shutil.c) = 4d8f05dee8e32f6621a0063b2bee2b0fc2335e08
diff --git a/x11/gnome-desktop3/patches/patch-aa b/x11/gnome-desktop3/patches/patch-aa
index 36a607688ad..ac79b366968 100644
--- a/x11/gnome-desktop3/patches/patch-aa
+++ b/x11/gnome-desktop3/patches/patch-aa
@@ -1,40 +1,9 @@
-$NetBSD: patch-aa,v 1.4 2014/09/21 04:43:51 prlw1 Exp $
-
-Fix build on systems which don't provide openat()
-https://bugzilla.gnome.org/show_bug.cgi?id=735974
+$NetBSD: patch-aa,v 1.5 2014/11/08 23:15:06 prlw1 Exp $
 
 allow 64-bit time_t on 32-bit system
 
 --- libgnome-desktop/gnome-desktop-thumbnail.c.orig	2013-11-21 11:14:44.000000000 +0000
 +++ libgnome-desktop/gnome-desktop-thumbnail.c
-@@ -43,7 +43,9 @@
- #define GNOME_DESKTOP_USE_UNSTABLE_API
- #include "gnome-desktop-thumbnail.h"
- #include <glib/gstdio.h>
-+#ifdef HAVE_OPENAT
- #include <libgsystem.h>
-+#endif
- 
- #define SECONDS_BETWEEN_STATS 10
- 
-@@ -376,14 +378,16 @@ _gdk_pixbuf_new_from_uri_at_scale (const
-     }
- 
-     if (input_stream == NULL) {
-+#ifdef HAVE_OPENAT
-         if (g_file_is_native (file))
-             input_stream = gs_file_read_noatime (file, NULL, &error);
-         else
-+#endif
-             input_stream = G_INPUT_STREAM (g_file_read (file, NULL, &error));
-         if (input_stream == NULL) {
-             g_warning ("Unable to create an input stream for %s: %s", uri, error->message);
-             g_clear_error (&error);
--	    g_object_unref (file);
-+            g_object_unref (file);
-             return NULL;
-         }
-     }
 @@ -1666,7 +1670,7 @@ gnome_desktop_thumbnail_is_valid (GdkPix
    thumb_mtime_str = gdk_pixbuf_get_option (pixbuf, "tEXt::Thumb::MTime");
    if (!thumb_mtime_str)
diff --git a/x11/gnome-desktop3/patches/patch-configure b/x11/gnome-desktop3/patches/patch-configure
deleted file mode 100644
index 2f01ec8e631..00000000000
--- a/x11/gnome-desktop3/patches/patch-configure
+++ /dev/null
@@ -1,566 +0,0 @@
-$NetBSD: patch-configure,v 1.1 2014/09/21 04:43:51 prlw1 Exp $
-
-Fix build on systems which don't provide openat()
-https://bugzilla.gnome.org/show_bug.cgi?id=735974
-
---- configure.orig	2014-09-21 04:28:34.000000000 +0000
-+++ configure
-@@ -676,10 +676,6 @@ CATOBJEXT
- CATALOGS
- MSGFMT_OPTS
- GETTEXT_PACKAGE
--YELP_HELP_RULES
--XMLLINT
--ITSTOOL
--HELP_DIR
- ISO_CODES_PREFIX
- XKB_BASE
- GNOME_DESKTOP_LIBS
-@@ -692,6 +688,8 @@ X_CFLAGS
- XMKMF
- XLIB_LIBS
- XLIB_CFLAGS
-+USE_LIBGSYSTEM_FALSE
-+USE_LIBGSYSTEM_TRUE
- LIBM
- XEXT_REQUIRED
- XRANDR_REQUIRED
-@@ -891,7 +889,6 @@ enable_deprecation_flags
- enable_desktop_docs
- with_pnp_ids_path
- with_x
--with_help_dir
- enable_introspection
- with_html_dir
- enable_gtk_doc
-@@ -915,8 +912,6 @@ XLIB_LIBS
- XMKMF
- GNOME_DESKTOP_CFLAGS
- GNOME_DESKTOP_LIBS
--ITSTOOL
--XMLLINT
- GTKDOC_DEPS_CFLAGS
- GTKDOC_DEPS_LIBS'
- 
-@@ -1581,7 +1576,6 @@ Optional Packages:
-  --with-gnome-distributor=DISTRIBUTOR Specify name of GNOME distributor
-   --with-pnp-ids-path     Specify the path to pnp.ids [default=(internal)]
-   --with-x                use the X Window System
--  --with-help-dir=DIR     path where help files are installed
-   --with-html-dir=PATH    path to installed docs
- 
- Some influential environment variables:
-@@ -1605,8 +1599,6 @@ Some influential environment variables:
-               C compiler flags for GNOME_DESKTOP, overriding pkg-config
-   GNOME_DESKTOP_LIBS
-               linker flags for GNOME_DESKTOP, overriding pkg-config
--  ITSTOOL     Path to the `itstool` command
--  XMLLINT     Path to the `xmllint` command
-   GTKDOC_DEPS_CFLAGS
-               C compiler flags for GTKDOC_DEPS, overriding pkg-config
-   GTKDOC_DEPS_LIBS
-@@ -2397,7 +2389,7 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
- 
- 
- 
--am__api_version='1.13'
-+am__api_version='1.14'
- 
- ac_aux_dir=
- for ac_dir in "$srcdir" "$srcdir/.." "$srcdir/../.."; do
-@@ -3079,6 +3071,47 @@ $as_echo "$am_cv_prog_tar_ustar" >&6; }
- 
- 
- 
-+# POSIX will say in a future version that running "rm -f" with no argument
-+# is OK; and we want to be able to make that assumption in our Makefile
-+# recipes.  So use an aggressive probe to check that the usage we want is
-+# actually supported "in the wild" to an acceptable degree.
-+# See automake bug#10828.
-+# To make any issue more visible, cause the running configure to be aborted
-+# by default if the 'rm' program in use doesn't match our expectations; the
-+# user can still override this though.
-+if rm -f && rm -fr && rm -rf; then : OK; else
-+  cat >&2 <<'END'
-+Oops!
-+
-+Your 'rm' program seems unable to run without file operands specified
-+on the command line, even when the '-f' option is present.  This is contrary
-+to the behaviour of most rm programs out there, and not conforming with
-+the upcoming POSIX standard: <http://austingroupbugs.net/view.php?id=542>
-+
-+Please tell bug-automake@gnu.org about your system, including the value
-+of your $PATH and any error possibly output before this message.  This
-+can help us improve future automake versions.
-+
-+END
-+  if test x"$ACCEPT_INFERIOR_RM_PROGRAM" = x"yes"; then
-+    echo 'Configuration will proceed anyway, since you have set the' >&2
-+    echo 'ACCEPT_INFERIOR_RM_PROGRAM variable to "yes"' >&2
-+    echo >&2
-+  else
-+    cat >&2 <<'END'
-+Aborting the configuration process, to ensure you take notice of the issue.
-+
-+You can download and install GNU coreutils to get an 'rm' implementation
-+that behaves properly: <http://www.gnu.org/software/coreutils/>.
-+
-+If you want to complete the configuration process using your problematic
-+'rm' anyway, export the environment variable ACCEPT_INFERIOR_RM_PROGRAM
-+to "yes", and re-run configure.
-+
-+END
-+    as_fn_error $? "Your 'rm' program is bad, sorry." "$LINENO" 5
-+  fi
-+fi
- 
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to enable maintainer-specific portions of Makefiles" >&5
- $as_echo_n "checking whether to enable maintainer-specific portions of Makefiles... " >&6; }
-@@ -4176,6 +4209,65 @@ ac_compile='$CC -c $CFLAGS $CPPFLAGS con
- ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
- ac_compiler_gnu=$ac_cv_c_compiler_gnu
- 
-+ac_ext=c
-+ac_cpp='$CPP $CPPFLAGS'
-+ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-+ac_compiler_gnu=$ac_cv_c_compiler_gnu
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CC understands -c and -o together" >&5
-+$as_echo_n "checking whether $CC understands -c and -o together... " >&6; }
-+if ${am_cv_prog_cc_c_o+:} false; then :
-+  $as_echo_n "(cached) " >&6
-+else
-+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-+/* end confdefs.h.  */
-+
-+int
-+main ()
-+{
-+
-+  ;
-+  return 0;
-+}
-+_ACEOF
-+  # Make sure it works both with $CC and with simple cc.
-+  # Following AC_PROG_CC_C_O, we do the test twice because some
-+  # compilers refuse to overwrite an existing .o file with -o,
-+  # though they will create one.
-+  am_cv_prog_cc_c_o=yes
-+  for am_i in 1 2; do
-+    if { echo "$as_me:$LINENO: $CC -c conftest.$ac_ext -o conftest2.$ac_objext" >&5
-+   ($CC -c conftest.$ac_ext -o conftest2.$ac_objext) >&5 2>&5
-+   ac_status=$?
-+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+   (exit $ac_status); } \
-+         && test -f conftest2.$ac_objext; then
-+      : OK
-+    else
-+      am_cv_prog_cc_c_o=no
-+      break
-+    fi
-+  done
-+  rm -f core conftest*
-+  unset am_i
-+fi
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_prog_cc_c_o" >&5
-+$as_echo "$am_cv_prog_cc_c_o" >&6; }
-+if test "$am_cv_prog_cc_c_o" != yes; then
-+   # Losing compiler, so override with the script.
-+   # FIXME: It is wrong to rewrite CC.
-+   # But if we don't then we get into trouble of one sort or another.
-+   # A longer-term fix would be to have automake use am__CC in this case,
-+   # and then we could set am__CC="\$(top_srcdir)/compile \$(CC)"
-+   CC="$am_aux_dir/compile $CC"
-+fi
-+ac_ext=c
-+ac_cpp='$CPP $CPPFLAGS'
-+ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-+ac_compiler_gnu=$ac_cv_c_compiler_gnu
-+
-+
- depcc="$CC"   am_compiler_list=
- 
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking dependency style of $depcc" >&5
-@@ -13141,6 +13233,65 @@ ac_compile='$CC -c $CFLAGS $CPPFLAGS con
- ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
- ac_compiler_gnu=$ac_cv_c_compiler_gnu
- 
-+ac_ext=c
-+ac_cpp='$CPP $CPPFLAGS'
-+ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-+ac_compiler_gnu=$ac_cv_c_compiler_gnu
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CC understands -c and -o together" >&5
-+$as_echo_n "checking whether $CC understands -c and -o together... " >&6; }
-+if ${am_cv_prog_cc_c_o+:} false; then :
-+  $as_echo_n "(cached) " >&6
-+else
-+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-+/* end confdefs.h.  */
-+
-+int
-+main ()
-+{
-+
-+  ;
-+  return 0;
-+}
-+_ACEOF
-+  # Make sure it works both with $CC and with simple cc.
-+  # Following AC_PROG_CC_C_O, we do the test twice because some
-+  # compilers refuse to overwrite an existing .o file with -o,
-+  # though they will create one.
-+  am_cv_prog_cc_c_o=yes
-+  for am_i in 1 2; do
-+    if { echo "$as_me:$LINENO: $CC -c conftest.$ac_ext -o conftest2.$ac_objext" >&5
-+   ($CC -c conftest.$ac_ext -o conftest2.$ac_objext) >&5 2>&5
-+   ac_status=$?
-+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+   (exit $ac_status); } \
-+         && test -f conftest2.$ac_objext; then
-+      : OK
-+    else
-+      am_cv_prog_cc_c_o=no
-+      break
-+    fi
-+  done
-+  rm -f core conftest*
-+  unset am_i
-+fi
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_prog_cc_c_o" >&5
-+$as_echo "$am_cv_prog_cc_c_o" >&6; }
-+if test "$am_cv_prog_cc_c_o" != yes; then
-+   # Losing compiler, so override with the script.
-+   # FIXME: It is wrong to rewrite CC.
-+   # But if we don't then we get into trouble of one sort or another.
-+   # A longer-term fix would be to have automake use am__CC in this case,
-+   # and then we could set am__CC="\$(top_srcdir)/compile \$(CC)"
-+   CC="$am_aux_dir/compile $CC"
-+fi
-+ac_ext=c
-+ac_cpp='$CPP $CPPFLAGS'
-+ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-+ac_compiler_gnu=$ac_cv_c_compiler_gnu
-+
-+
- depcc="$CC"   am_compiler_list=
- 
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking dependency style of $depcc" >&5
-@@ -13773,6 +13924,26 @@ esac
- 
- 
- 
-+for ac_func in openat
-+do :
-+  ac_fn_c_check_func "$LINENO" "openat" "ac_cv_func_openat"
-+if test "x$ac_cv_func_openat" = xyes; then :
-+  cat >>confdefs.h <<_ACEOF
-+#define HAVE_OPENAT 1
-+_ACEOF
-+
-+fi
-+done
-+
-+ if test $ac_cv_func_openat = yes; then
-+  USE_LIBGSYSTEM_TRUE=
-+  USE_LIBGSYSTEM_FALSE='#'
-+else
-+  USE_LIBGSYSTEM_TRUE='#'
-+  USE_LIBGSYSTEM_FALSE=
-+fi
-+
-+
- 
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for X" >&5
- $as_echo_n "checking for X... " >&6; }
-@@ -15256,276 +15427,7 @@ $as_echo "#define HAVE_TIMERFD 1" >>conf
- fi
- 
- 
--
--
--
--
--
--
--# Check whether --with-help-dir was given.
--if test "${with_help_dir+set}" = set; then :
--  withval=$with_help_dir;
--else
--  with_help_dir='${datadir}/help'
--fi
--
--HELP_DIR="$with_help_dir"
--
--
--
--# Extract the first word of "itstool", so it can be a program name with args.
--set dummy itstool; ac_word=$2
--{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
--$as_echo_n "checking for $ac_word... " >&6; }
--if ${ac_cv_prog_ITSTOOL+:} false; then :
--  $as_echo_n "(cached) " >&6
--else
--  if test -n "$ITSTOOL"; then
--  ac_cv_prog_ITSTOOL="$ITSTOOL" # Let the user override the test.
--else
--as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
--for as_dir in $PATH
--do
--  IFS=$as_save_IFS
--  test -z "$as_dir" && as_dir=.
--    for ac_exec_ext in '' $ac_executable_extensions; do
--  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
--    ac_cv_prog_ITSTOOL="itstool"
--    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
--    break 2
--  fi
--done
--  done
--IFS=$as_save_IFS
--
--fi
--fi
--ITSTOOL=$ac_cv_prog_ITSTOOL
--if test -n "$ITSTOOL"; then
--  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ITSTOOL" >&5
--$as_echo "$ITSTOOL" >&6; }
--else
--  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
--$as_echo "no" >&6; }
--fi
--
--
--if test x"$ITSTOOL" = x; then
--  as_fn_error $? "itstool not found" "$LINENO" 5
--fi
--
--
--# Extract the first word of "xmllint", so it can be a program name with args.
--set dummy xmllint; ac_word=$2
--{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
--$as_echo_n "checking for $ac_word... " >&6; }
--if ${ac_cv_prog_XMLLINT+:} false; then :
--  $as_echo_n "(cached) " >&6
--else
--  if test -n "$XMLLINT"; then
--  ac_cv_prog_XMLLINT="$XMLLINT" # Let the user override the test.
--else
--as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
--for as_dir in $PATH
--do
--  IFS=$as_save_IFS
--  test -z "$as_dir" && as_dir=.
--    for ac_exec_ext in '' $ac_executable_extensions; do
--  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
--    ac_cv_prog_XMLLINT="xmllint"
--    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
--    break 2
--  fi
--done
--  done
--IFS=$as_save_IFS
--
--fi
--fi
--XMLLINT=$ac_cv_prog_XMLLINT
--if test -n "$XMLLINT"; then
--  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $XMLLINT" >&5
--$as_echo "$XMLLINT" >&6; }
--else
--  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
--$as_echo "no" >&6; }
--fi
--
--
--if test x"$XMLLINT" = x; then
--  as_fn_error $? "xmllint not found" "$LINENO" 5
--fi
--
--YELP_HELP_RULES='
--HELP_ID ?=
--HELP_POT ?=
--HELP_FILES ?=
--HELP_EXTRA ?=
--HELP_MEDIA ?=
--HELP_LINGUAS ?=
--
--_HELP_LINGUAS = $(if $(filter environment,$(origin LINGUAS)),$(filter $(LINGUAS),$(HELP_LINGUAS)),$(HELP_LINGUAS))
--_HELP_POTFILE = $(if $(HELP_POT),$(HELP_POT),$(if $(HELP_ID),$(HELP_ID).pot))
--_HELP_POFILES = $(if $(HELP_ID),$(foreach lc,$(_HELP_LINGUAS),$(lc)/$(lc).po))
--_HELP_MOFILES = $(patsubst %.po,%.mo,$(_HELP_POFILES))
--_HELP_C_FILES = $(foreach f,$(HELP_FILES),C/$(f))
--_HELP_C_EXTRA = $(foreach f,$(HELP_EXTRA),C/$(f))
--_HELP_C_MEDIA = $(foreach f,$(HELP_MEDIA),C/$(f))
--_HELP_LC_FILES = $(foreach lc,$(_HELP_LINGUAS),$(foreach f,$(HELP_FILES),$(lc)/$(f)))
--_HELP_LC_STAMPS = $(foreach lc,$(_HELP_LINGUAS),$(lc)/$(lc).stamp)
--
--_HELP_DEFAULT_V = $(if $(AM_DEFAULT_VERBOSITY),$(AM_DEFAULT_VERBOSITY),1)
--_HELP_V = $(if $(V),$(V),$(_HELP_DEFAULT_V))
--_HELP_LC_VERBOSE = $(_HELP_LC_VERBOSE_$(_HELP_V))
--_HELP_LC_VERBOSE_ = $(_HELP_LC_VERBOSE_$(_HELP_DEFAULT_V))
--_HELP_LC_VERBOSE_0 = @echo "  GEN    "$(dir $@);
--
--all: $(_HELP_C_FILES) $(_HELP_C_EXTRA) $(_HELP_C_MEDIA) $(_HELP_LC_FILES) $(_HELP_POFILES)
--
--.PHONY: pot
--pot: $(_HELP_POTFILE)
--$(_HELP_POTFILE): $(_HELP_C_FILES) $(_HELP_C_EXTRA) $(_HELP_C_MEDIA)
--	$(AM_V_GEN)if test -d "C"; then d=; else d="$(srcdir)/"; fi; \
--	$(ITSTOOL) -o "$@" $(foreach f,$(_HELP_C_FILES),"$${d}$(f)")
--
--.PHONY: repo
--repo: $(_HELP_POTFILE)
--	$(AM_V_at)for po in $(_HELP_POFILES); do \
--	  if test "x$(_HELP_V)" = "x0"; then echo "  GEN    $${po}"; fi; \
--	  msgmerge -q -o "$${po}" "$${po}" "$(_HELP_POTFILE)"; \
--	done
--
--$(_HELP_POFILES):
--	$(AM_V_at)if ! test -d "$(dir $@)"; then mkdir "$(dir $@)"; fi
--	$(AM_V_at)if test ! -f "$@" -a -f "$(srcdir)/$@"; then cp "$(srcdir)/$@" "$@"; fi
--	$(AM_V_GEN)if ! test -f "$@"; then \
--	  (cd "$(dir $@)" && \
--	    $(ITSTOOL) -o "$(notdir $@).tmp" $(_HELP_C_FILES) && \
--	    mv "$(notdir $@).tmp" "$(notdir $@)"); \
--	else \
--	  (cd "$(dir $@)" && \
--	    $(ITSTOOL) -o "$(notdir $@).tmp" $(_HELP_C_FILES) && \
--	    msgmerge -o "$(notdir $@)" "$(notdir $@)" "$(notdir $@).tmp" && \
--	    rm "$(notdir $@).tmp"); \
--	fi
--
--$(_HELP_MOFILES): %.mo: %.po
--	$(AM_V_at)if ! test -d "$(dir $@)"; then mkdir "$(dir $@)"; fi
--	$(AM_V_GEN)msgfmt -o "$@" "$<"
--
--$(_HELP_LC_FILES): $(_HELP_LINGUAS)
--$(_HELP_LINGUAS): $(_HELP_LC_STAMPS)
--$(_HELP_LC_STAMPS): %.stamp: %.mo
--$(_HELP_LC_STAMPS): $(_HELP_C_FILES) $(_HELP_C_EXTRA)
--	$(AM_V_at)if ! test -d "$(dir $@)"; then mkdir "$(dir $@)"; fi
--	$(_HELP_LC_VERBOSE)if test -d "C"; then d="../"; else d="$(abs_srcdir)/"; fi; \
--	mo="$(dir $@)$(patsubst %/$(notdir $@),%,$@).mo"; \
--	if test -f "$${mo}"; then mo="../$${mo}"; else mo="$(abs_srcdir)/$${mo}"; fi; \
--	(cd "$(dir $@)" && $(ITSTOOL) -m "$${mo}" $(foreach f,$(_HELP_C_FILES),$${d}/$(f))) && \
--	touch "$@"
--
--.PHONY: clean-help
--mostlyclean-am: $(if $(HELP_ID),clean-help)
--clean-help:
--	rm -f $(_HELP_LC_FILES) $(_HELP_LC_STAMPS) $(_HELP_MOFILES)
--
--EXTRA_DIST ?=
--EXTRA_DIST += $(_HELP_C_EXTRA) $(_HELP_C_MEDIA)
--EXTRA_DIST += $(foreach lc,$(HELP_LINGUAS),$(lc)/$(lc).stamp)
--EXTRA_DIST += $(foreach lc,$(HELP_LINGUAS),$(lc)/$(lc).po)
--EXTRA_DIST += $(foreach f,$(HELP_MEDIA),$(foreach lc,$(HELP_LINGUAS),$(wildcard $(lc)/$(f))))
--
--distdir: distdir-help-files
--distdir-help-files:
--	@for lc in C $(HELP_LINGUAS); do \
--	  $(MKDIR_P) "$(distdir)/$$lc"; \
--	  for file in $(HELP_FILES); do \
--	    if test -f "$$lc/$$file"; then d=./; else d=$(srcdir)/; fi; \
--	    cp -p "$$d$$lc/$$file" "$(distdir)/$$lc/" || exit 1; \
--	  done; \
--	done; \
--
--.PHONY: check-help
--check: check-help
--check-help:
--	for lc in C $(_HELP_LINGUAS); do \
--	  if test -d "$$lc"; \
--	    then d=; \
--	    xmlpath="$$lc"; \
--	  else \
--	    d="$(srcdir)/"; \
--	    xmlpath="$$lc:$(srcdir)/$$lc"; \
--	  fi; \
--	  for page in $(HELP_FILES); do \
--	    echo "$(XMLLINT) --noout --noent --path $$xmlpath --xinclude $$d$$lc/$$page"; \
--	    $(XMLLINT) --noout --noent --path "$$xmlpath" --xinclude "$$d$$lc/$$page"; \
--	  done; \
--	done
--
--
--.PHONY: install-help
--install-data-am: $(if $(HELP_ID),install-help)
--install-help:
--	@for lc in C $(_HELP_LINGUAS); do \
--	  $(mkinstalldirs) "$(DESTDIR)$(HELP_DIR)/$$lc/$(HELP_ID)" || exit 1; \
--	done
--	@for lc in C $(_HELP_LINGUAS); do for f in $(HELP_FILES); do \
--	  if test -f "$$lc/$$f"; then d=; else d="$(srcdir)/"; fi; \
--	  helpdir="$(DESTDIR)$(HELP_DIR)/$$lc/$(HELP_ID)/"; \
--	  if ! test -d "$$helpdir"; then $(mkinstalldirs) "$$helpdir"; fi; \
--	  echo "$(INSTALL_DATA) $$d$$lc/$$f $$helpdir`basename $$f`"; \
--	  $(INSTALL_DATA) "$$d$$lc/$$f" "$$helpdir`basename $$f`" || exit 1; \
--	done; done
--	@for f in $(_HELP_C_EXTRA); do \
--	  lc=`dirname "$$f"`; lc=`basename "$$lc"`; \
--	  if test -f "$$f"; then d=; else d="$(srcdir)/"; fi; \
--	  helpdir="$(DESTDIR)$(HELP_DIR)/$$lc/$(HELP_ID)/"; \
--	  if ! test -d "$$helpdir"; then $(mkinstalldirs) "$$helpdir"; fi; \
--	  echo "$(INSTALL_DATA) $$d$$f $$helpdir`basename $$f`"; \
--	  $(INSTALL_DATA) "$$d$$f" "$$helpdir`basename $$f`" || exit 1; \
--	done
--	@for f in $(HELP_MEDIA); do \
--	  for lc in C $(_HELP_LINGUAS); do \
--	    if test -f "$$lc$$f"; then d=; else d="$(srcdir)/"; fi; \
--	    helpdir="$(DESTDIR)$(HELP_DIR)/$$lc/$(HELP_ID)/"; \
--	    mdir=`dirname "$$f"`; \
--	    if test "x$mdir" = "x."; then mdir=""; fi; \
--	    if ! test -d "$$helpdir$$mdir"; then $(mkinstalldirs) "$$helpdir$$mdir"; fi; \
--	    if test -f "$$d$$lc/$$f"; then \
--	      echo "$(INSTALL_DATA) $$d$$lc/$$f $$helpdir$$f"; \
--	      $(INSTALL_DATA) "$$d$$lc/$$f" "$$helpdir$$f" || exit 1; \
--	    elif test "x$$lc" != "xC"; then \
--	      echo "$(LN_S) -f $(HELP_DIR)/C/$(HELP_ID)/$$f $$helpdir$$f"; \
--	      $(LN_S) -f "$(HELP_DIR)/C/$(HELP_ID)/$$f" "$$helpdir$$f" || exit 1; \
--	    fi; \
--	  done; \
--	done
--
--.PHONY: uninstall-help
--uninstall-am: $(if $(HELP_ID),uninstall-help)
--uninstall-help:
--	for lc in C $(_HELP_LINGUAS); do for f in $(HELP_FILES); do \
--	  helpdir="$(DESTDIR)$(HELP_DIR)/$$lc/$(HELP_ID)/"; \
--	  echo "rm -f $$helpdir`basename $$f`"; \
--	  rm -f "$$helpdir`basename $$f`"; \
--	done; done
--	@for f in $(_HELP_C_EXTRA); do \
--	  lc=`dirname "$$f"`; lc=`basename "$$lc"`; \
--	  helpdir="$(DESTDIR)$(HELP_DIR)/$$lc/$(HELP_ID)/"; \
--	  echo "rm -f $$helpdir`basename $$f`"; \
--	  rm -f "$$helpdir`basename $$f`"; \
--	done
--	@for f in $(HELP_MEDIA); do \
--	  for lc in C $(_HELP_LINGUAS); do \
--	    helpdir="$(DESTDIR)$(HELP_DIR)/$$lc/$(HELP_ID)/"; \
--	    echo "rm -f $$helpdir$$f"; \
--	    rm -f "$$helpdir$$f"; \
--	  done; \
--	done;
--'
--
--
--
-+YELP_HELP_INIT
- 
- 
- GETTEXT_PACKAGE=gnome-desktop-3.0
-@@ -16840,6 +16742,10 @@ if test -z "${USE_INTERNAL_PNP_IDS_TRUE}
-   as_fn_error $? "conditional \"USE_INTERNAL_PNP_IDS\" was never defined.
- Usually this means the macro was only invoked conditionally." "$LINENO" 5
- fi
-+if test -z "${USE_LIBGSYSTEM_TRUE}" && test -z "${USE_LIBGSYSTEM_FALSE}"; then
-+  as_fn_error $? "conditional \"USE_LIBGSYSTEM\" was never defined.
-+Usually this means the macro was only invoked conditionally." "$LINENO" 5
-+fi
- if test -z "${HAVE_INTROSPECTION_TRUE}" && test -z "${HAVE_INTROSPECTION_FALSE}"; then
-   as_fn_error $? "conditional \"HAVE_INTROSPECTION\" was never defined.
- Usually this means the macro was only invoked conditionally." "$LINENO" 5
diff --git a/x11/gnome-desktop3/patches/patch-libgnome-desktop_Makefile.in b/x11/gnome-desktop3/patches/patch-libgnome-desktop_Makefile.in
deleted file mode 100644
index ef7a22ae5c7..00000000000
--- a/x11/gnome-desktop3/patches/patch-libgnome-desktop_Makefile.in
+++ /dev/null
@@ -1,274 +0,0 @@
-$NetBSD: patch-libgnome-desktop_Makefile.in,v 1.1 2014/09/21 04:43:51 prlw1 Exp $
-
-Fix build on systems which don't provide openat()
-https://bugzilla.gnome.org/show_bug.cgi?id=735974
-
---- libgnome-desktop/Makefile.in.orig	2014-09-21 04:29:16.000000000 +0000
-+++ libgnome-desktop/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.13.4 from Makefile.am.
-+# Makefile.in generated by automake 1.14.1 from Makefile.am.
- # @configure_input@
- 
- # Copyright (C) 1994-2013 Free Software Foundation, Inc.
-@@ -98,14 +98,18 @@ PRE_UNINSTALL = :
- POST_UNINSTALL = :
- build_triplet = @build@
- host_triplet = @host@
-+@USE_LIBGSYSTEM_TRUE@am__append_1 = -I$(srcdir)/libgsystem
- DIST_COMMON = $(srcdir)/libgsystem/Makefile-libgsystem.am \
- 	$(srcdir)/Makefile.in $(srcdir)/Makefile.am \
- 	$(srcdir)/gnome-desktop-3.0.pc.in \
- 	$(srcdir)/gnome-desktop-3.0-uninstalled.pc.in \
- 	$(top_srcdir)/depcomp $(libgnome_desktop_HEADERS)
--@HAVE_INTROSPECTION_TRUE@am__append_1 = $(patsubst %,--c-include='libgnome-desktop/%',$(libgnome_desktop_HEADERS))
--@HAVE_INTROSPECTION_TRUE@am__append_2 = GnomeDesktop-3.0.gir
--@HAVE_INTROSPECTION_TRUE@am__append_3 = $(gir_DATA) $(typelib_DATA)
-+@USE_LIBGSYSTEM_TRUE@am__append_2 = $(libgsystem_srcpath)/README $(libgsystem_srcpath)/COPYING
-+@USE_LIBGSYSTEM_TRUE@am__append_3 = libgsystem.la
-+@USE_LIBGSYSTEM_TRUE@am__append_4 = libgsystem.la
-+@HAVE_INTROSPECTION_TRUE@am__append_5 = $(patsubst %,--c-include='libgnome-desktop/%',$(libgnome_desktop_HEADERS))
-+@HAVE_INTROSPECTION_TRUE@am__append_6 = GnomeDesktop-3.0.gir
-+@HAVE_INTROSPECTION_TRUE@am__append_7 = $(gir_DATA) $(typelib_DATA)
- libexec_PROGRAMS = gnome-rr-debug$(EXEEXT)
- noinst_PROGRAMS = test-xkb-info$(EXEEXT) test-pnp-ids$(EXEEXT) \
- 	test-wall-clock$(EXEEXT) test-desktop-thumbnail$(EXEEXT) \
-@@ -158,7 +162,7 @@ am__installdirs = "$(DESTDIR)$(libdir)" 
- LTLIBRARIES = $(lib_LTLIBRARIES) $(noinst_LTLIBRARIES)
- am__DEPENDENCIES_1 =
- libgnome_desktop_3_la_DEPENDENCIES = $(am__DEPENDENCIES_1) \
--	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) libgsystem.la
-+	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) $(am__append_4)
- am__objects_1 = gnome-desktop-thumbnail.lo \
- 	gnome-thumbnail-pixbuf-utils.lo gnome-bg.lo \
- 	gnome-bg-slide-show.lo gnome-bg-crossfade.lo gnome-rr.lo \
-@@ -178,18 +182,40 @@ libgnome_desktop_3_la_LINK = $(LIBTOOL) 
- 	$(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \
- 	$(AM_CFLAGS) $(CFLAGS) $(libgnome_desktop_3_la_LDFLAGS) \
- 	$(LDFLAGS) -o $@
--am__DEPENDENCIES_2 = $(am__DEPENDENCIES_1)
--libgsystem_la_DEPENDENCIES = $(am__DEPENDENCIES_2)
--am_libgsystem_la_OBJECTS = libgsystem_la-gsystem-local-alloc.lo \
--	libgsystem_la-gsystem-console.lo \
--	libgsystem_la-gsystem-file-utils.lo \
--	libgsystem_la-gsystem-shutil.lo libgsystem_la-gsystem-log.lo \
--	libgsystem_la-gsystem-subprocess-context.lo \
--	libgsystem_la-gsystem-subprocess.lo
-+@USE_LIBGSYSTEM_TRUE@am__DEPENDENCIES_2 = $(am__DEPENDENCIES_1)
-+@USE_LIBGSYSTEM_TRUE@libgsystem_la_DEPENDENCIES =  \
-+@USE_LIBGSYSTEM_TRUE@	$(am__DEPENDENCIES_2)
-+am__libgsystem_la_SOURCES_DIST =  \
-+	$(libgsystem_srcpath)/gsystem-local-alloc.h \
-+	$(libgsystem_srcpath)/gsystem-local-alloc.c \
-+	$(libgsystem_srcpath)/gsystem-console.h \
-+	$(libgsystem_srcpath)/gsystem-console.c \
-+	$(libgsystem_srcpath)/gsystem-file-utils.h \
-+	$(libgsystem_srcpath)/gsystem-file-utils.c \
-+	$(libgsystem_srcpath)/gsystem-glib-compat.h \
-+	$(libgsystem_srcpath)/gsystem-shutil.h \
-+	$(libgsystem_srcpath)/gsystem-shutil.c \
-+	$(libgsystem_srcpath)/gsystem-log.h \
-+	$(libgsystem_srcpath)/gsystem-log.c \
-+	$(libgsystem_srcpath)/gsystem-subprocess-context.h \
-+	$(libgsystem_srcpath)/gsystem-subprocess-context-private.h \
-+	$(libgsystem_srcpath)/gsystem-subprocess-context.c \
-+	$(libgsystem_srcpath)/gsystem-subprocess.h \
-+	$(libgsystem_srcpath)/gsystem-subprocess.c \
-+	$(libgsystem_srcpath)/libgsystem.h
-+@USE_LIBGSYSTEM_TRUE@am_libgsystem_la_OBJECTS =  \
-+@USE_LIBGSYSTEM_TRUE@	libgsystem_la-gsystem-local-alloc.lo \
-+@USE_LIBGSYSTEM_TRUE@	libgsystem_la-gsystem-console.lo \
-+@USE_LIBGSYSTEM_TRUE@	libgsystem_la-gsystem-file-utils.lo \
-+@USE_LIBGSYSTEM_TRUE@	libgsystem_la-gsystem-shutil.lo \
-+@USE_LIBGSYSTEM_TRUE@	libgsystem_la-gsystem-log.lo \
-+@USE_LIBGSYSTEM_TRUE@	libgsystem_la-gsystem-subprocess-context.lo \
-+@USE_LIBGSYSTEM_TRUE@	libgsystem_la-gsystem-subprocess.lo
- libgsystem_la_OBJECTS = $(am_libgsystem_la_OBJECTS)
- libgsystem_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
- 	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(libgsystem_la_CFLAGS) \
- 	$(CFLAGS) $(libgsystem_la_LDFLAGS) $(LDFLAGS) -o $@
-+@USE_LIBGSYSTEM_TRUE@am_libgsystem_la_rpath =
- PROGRAMS = $(libexec_PROGRAMS) $(noinst_PROGRAMS)
- am_gnome_rr_debug_OBJECTS = gnome-rr-debug.$(OBJEXT)
- gnome_rr_debug_OBJECTS = $(am_gnome_rr_debug_OBJECTS)
-@@ -255,7 +281,7 @@ SOURCES = $(libgnome_desktop_3_la_SOURCE
- 	test-idle-monitor.c test-languages.c test-pnp-ids.c \
- 	test-wall-clock.c test-xkb-info.c
- DIST_SOURCES = $(libgnome_desktop_3_la_SOURCES) \
--	$(libgsystem_la_SOURCES) $(gnome_rr_debug_SOURCES) \
-+	$(am__libgsystem_la_SOURCES_DIST) $(gnome_rr_debug_SOURCES) \
- 	test-desktop-thumbnail.c test-idle-monitor.c test-languages.c \
- 	test-pnp-ids.c test-wall-clock.c test-xkb-info.c
- am__can_run_installinfo = \
-@@ -339,7 +365,6 @@ GTKDOC_DEPS_LIBS = @GTKDOC_DEPS_LIBS@
- GTKDOC_MKPDF = @GTKDOC_MKPDF@
- GTKDOC_REBASE = @GTKDOC_REBASE@
- GTK_REQUIRED = @GTK_REQUIRED@
--HELP_DIR = @HELP_DIR@
- HTML_DIR = @HTML_DIR@
- INSTALL = @INSTALL@
- INSTALL_DATA = @INSTALL_DATA@
-@@ -365,7 +390,6 @@ INTROSPECTION_MAKEFILE = @INTROSPECTION_
- INTROSPECTION_SCANNER = @INTROSPECTION_SCANNER@
- INTROSPECTION_TYPELIBDIR = @INTROSPECTION_TYPELIBDIR@
- ISO_CODES_PREFIX = @ISO_CODES_PREFIX@
--ITSTOOL = @ITSTOOL@
- LD = @LD@
- LDFLAGS = @LDFLAGS@
- LIBM = @LIBM@
-@@ -421,7 +445,6 @@ XKB_BASE = @XKB_BASE@
- XLIB_CFLAGS = @XLIB_CFLAGS@
- XLIB_LIBS = @XLIB_LIBS@
- XMKMF = @XMKMF@
--XMLLINT = @XMLLINT@
- XRANDR_REQUIRED = @XRANDR_REQUIRED@
- X_CFLAGS = @X_CFLAGS@
- X_EXTRA_LIBS = @X_EXTRA_LIBS@
-@@ -481,56 +504,46 @@ target_alias = @target_alias@
- top_build_prefix = @top_build_prefix@
- top_builddir = @top_builddir@
- top_srcdir = @top_srcdir@
--CLEANFILES = $(am__append_3)
--EXTRA_DIST = \
--	idle-monitor.xml			\
--	xrandr.xml				\
--	gnome-desktop-3.0.pc.in			\
--	gnome-desktop-3.0-uninstalled.pc.in	\
-+CLEANFILES = $(am__append_7)
-+EXTRA_DIST = $(am__append_2) idle-monitor.xml xrandr.xml \
-+	gnome-desktop-3.0.pc.in gnome-desktop-3.0-uninstalled.pc.in \
- 	$(pnpdata_DATA_dist)
--
--noinst_LTLIBRARIES = libgsystem.la
-+noinst_LTLIBRARIES = $(am__append_3)
- lib_LTLIBRARIES = libgnome-desktop-3.la
--AM_CPPFLAGS = \
--	-I$(top_srcdir)						\
--	-I$(srcdir)/libgsystem					\
--	$(GNOME_DESKTOP_CFLAGS)					\
--	$(XLIB_CFLAGS)						\
--	-DG_LOG_DOMAIN=\"GnomeDesktop\"				\
--	-DGNOMELOCALEDIR=\""$(prefix)/$(DATADIRNAME)/locale\""	\
--	-DISO_CODES_PREFIX=\""$(ISO_CODES_PREFIX)"\"		\
--	-DLIBLOCALEDIR=\""$(prefix)/lib/locale"\"		\
--	-DPNP_IDS=\""$(PNP_IDS)"\"				\
--	-DXKB_BASE=\""$(XKB_BASE)"\"				\
--	$(DISABLE_DEPRECATED_CFLAGS)
--
-+AM_CPPFLAGS = -I$(top_srcdir) $(GNOME_DESKTOP_CFLAGS) $(XLIB_CFLAGS) \
-+	-DG_LOG_DOMAIN=\"GnomeDesktop\" \
-+	-DGNOMELOCALEDIR=\""$(prefix)/$(DATADIRNAME)/locale\"" \
-+	-DISO_CODES_PREFIX=\""$(ISO_CODES_PREFIX)"\" \
-+	-DLIBLOCALEDIR=\""$(prefix)/lib/locale"\" \
-+	-DPNP_IDS=\""$(PNP_IDS)"\" -DXKB_BASE=\""$(XKB_BASE)"\" \
-+	$(DISABLE_DEPRECATED_CFLAGS) $(am__append_1)
- AM_CFLAGS = $(WARN_CFLAGS)
--libgsystem_srcpath := libgsystem
--libgsystem_cflags = $(GNOME_DESKTOP_CFLAGS)
--libgsystem_libs = $(GNOME_DESKTOP_LIBS)
--libgsystem_la_SOURCES = \
--	$(libgsystem_srcpath)/gsystem-local-alloc.h \
--	$(libgsystem_srcpath)/gsystem-local-alloc.c \
--	$(libgsystem_srcpath)/gsystem-console.h \
--	$(libgsystem_srcpath)/gsystem-console.c \
--	$(libgsystem_srcpath)/gsystem-file-utils.h \
--	$(libgsystem_srcpath)/gsystem-file-utils.c \
--	$(libgsystem_srcpath)/gsystem-glib-compat.h \
--	$(libgsystem_srcpath)/gsystem-shutil.h \
--	$(libgsystem_srcpath)/gsystem-shutil.c \
--	$(libgsystem_srcpath)/gsystem-log.h \
--	$(libgsystem_srcpath)/gsystem-log.c \
--	$(libgsystem_srcpath)/gsystem-subprocess-context.h \
--	$(libgsystem_srcpath)/gsystem-subprocess-context-private.h \
--	$(libgsystem_srcpath)/gsystem-subprocess-context.c \
--	$(libgsystem_srcpath)/gsystem-subprocess.h \
--	$(libgsystem_srcpath)/gsystem-subprocess.c \
--	$(libgsystem_srcpath)/libgsystem.h \
--	$(NULL)
--
--libgsystem_la_CFLAGS = $(AM_CFLAGS) $(libgsystem_cflags)
--libgsystem_la_LDFLAGS = -avoid-version -Bsymbolic-functions -export-symbols-regex "^gs_" -no-undefined -export-dynamic
--libgsystem_la_LIBADD = $(libgsystem_libs)
-+@USE_LIBGSYSTEM_TRUE@libgsystem_srcpath := libgsystem
-+@USE_LIBGSYSTEM_TRUE@libgsystem_cflags = $(GNOME_DESKTOP_CFLAGS)
-+@USE_LIBGSYSTEM_TRUE@libgsystem_libs = $(GNOME_DESKTOP_LIBS)
-+@USE_LIBGSYSTEM_TRUE@libgsystem_la_SOURCES = \
-+@USE_LIBGSYSTEM_TRUE@	$(libgsystem_srcpath)/gsystem-local-alloc.h \
-+@USE_LIBGSYSTEM_TRUE@	$(libgsystem_srcpath)/gsystem-local-alloc.c \
-+@USE_LIBGSYSTEM_TRUE@	$(libgsystem_srcpath)/gsystem-console.h \
-+@USE_LIBGSYSTEM_TRUE@	$(libgsystem_srcpath)/gsystem-console.c \
-+@USE_LIBGSYSTEM_TRUE@	$(libgsystem_srcpath)/gsystem-file-utils.h \
-+@USE_LIBGSYSTEM_TRUE@	$(libgsystem_srcpath)/gsystem-file-utils.c \
-+@USE_LIBGSYSTEM_TRUE@	$(libgsystem_srcpath)/gsystem-glib-compat.h \
-+@USE_LIBGSYSTEM_TRUE@	$(libgsystem_srcpath)/gsystem-shutil.h \
-+@USE_LIBGSYSTEM_TRUE@	$(libgsystem_srcpath)/gsystem-shutil.c \
-+@USE_LIBGSYSTEM_TRUE@	$(libgsystem_srcpath)/gsystem-log.h \
-+@USE_LIBGSYSTEM_TRUE@	$(libgsystem_srcpath)/gsystem-log.c \
-+@USE_LIBGSYSTEM_TRUE@	$(libgsystem_srcpath)/gsystem-subprocess-context.h \
-+@USE_LIBGSYSTEM_TRUE@	$(libgsystem_srcpath)/gsystem-subprocess-context-private.h \
-+@USE_LIBGSYSTEM_TRUE@	$(libgsystem_srcpath)/gsystem-subprocess-context.c \
-+@USE_LIBGSYSTEM_TRUE@	$(libgsystem_srcpath)/gsystem-subprocess.h \
-+@USE_LIBGSYSTEM_TRUE@	$(libgsystem_srcpath)/gsystem-subprocess.c \
-+@USE_LIBGSYSTEM_TRUE@	$(libgsystem_srcpath)/libgsystem.h \
-+@USE_LIBGSYSTEM_TRUE@	$(NULL)
-+
-+@USE_LIBGSYSTEM_TRUE@libgsystem_la_CFLAGS = $(AM_CFLAGS) $(libgsystem_cflags)
-+@USE_LIBGSYSTEM_TRUE@libgsystem_la_LDFLAGS = -avoid-version -Bsymbolic-functions -export-symbols-regex "^gs_" -no-undefined -export-dynamic
-+@USE_LIBGSYSTEM_TRUE@libgsystem_la_LIBADD = $(libgsystem_libs)
- introspection_sources = \
- 	gnome-desktop-thumbnail.c 	\
- 	gnome-thumbnail-pixbuf-utils.c 	\
-@@ -562,13 +575,8 @@ libgnome_desktop_3_la_SOURCES = \
- dbus_xrandr_built_sources = meta-dbus-xrandr.c meta-dbus-xrandr.h
- dbus_idle_built_sources = meta-dbus-idle-monitor.c meta-dbus-idle-monitor.h
- BUILT_SOURCES = $(dbus_xrandr_built_sources) $(dbus_idle_built_sources)
--libgnome_desktop_3_la_LIBADD = \
--	$(XLIB_LIBS)		\
--	$(LIBM)			\
--	$(GNOME_DESKTOP_LIBS)	\
--	libgsystem.la           \
--	-lrt
--
-+libgnome_desktop_3_la_LIBADD = $(XLIB_LIBS) $(LIBM) \
-+	$(GNOME_DESKTOP_LIBS) -lrt $(am__append_4)
- libgnome_desktop_3_la_LDFLAGS = \
- 	-version-info $(LT_VERSION) \
- 	-export-symbols-regex "^gnome_.*" \
-@@ -593,9 +601,9 @@ libgnome_desktop_HEADERS = \
- @USE_INTERNAL_PNP_IDS_TRUE@pnpdatadir = $(datadir)/libgnome-desktop-3.0
- @USE_INTERNAL_PNP_IDS_TRUE@pnpdata_DATA = pnp.ids
- pnpdata_DATA_dist = pnp.ids
--INTROSPECTION_GIRS = $(am__append_2)
-+INTROSPECTION_GIRS = $(am__append_6)
- INTROSPECTION_SCANNER_ARGS = --add-include-path=$(srcdir) --warn-all \
--	$(am__append_1)
-+	$(am__append_5)
- INTROSPECTION_COMPILER_ARGS = --includedir=$(srcdir)
- @HAVE_INTROSPECTION_TRUE@GnomeDesktop_3_0_gir_INCLUDES = GObject-2.0 Gtk-3.0 GDesktopEnums-3.0
- @HAVE_INTROSPECTION_TRUE@GnomeDesktop_3_0_gir_PACKAGES = gdk-pixbuf-2.0 glib-2.0 gobject-2.0 gio-2.0 gtk+-3.0 gsettings-desktop-schemas
-@@ -720,7 +728,7 @@ libgnome-desktop-3.la: $(libgnome_deskto
- 	$(AM_V_CCLD)$(libgnome_desktop_3_la_LINK) -rpath $(libdir) $(libgnome_desktop_3_la_OBJECTS) $(libgnome_desktop_3_la_LIBADD) $(LIBS)
- 
- libgsystem.la: $(libgsystem_la_OBJECTS) $(libgsystem_la_DEPENDENCIES) $(EXTRA_libgsystem_la_DEPENDENCIES) 
--	$(AM_V_CCLD)$(libgsystem_la_LINK)  $(libgsystem_la_OBJECTS) $(libgsystem_la_LIBADD) $(LIBS)
-+	$(AM_V_CCLD)$(libgsystem_la_LINK) $(am_libgsystem_la_rpath) $(libgsystem_la_OBJECTS) $(libgsystem_la_LIBADD) $(LIBS)
- install-libexecPROGRAMS: $(libexec_PROGRAMS)
- 	@$(NORMAL_INSTALL)
- 	@list='$(libexec_PROGRAMS)'; test -n "$(libexecdir)" || list=; \
-@@ -851,14 +859,14 @@ distclean-compile:
- @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
- @AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
- @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
--@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(COMPILE) -c $<
-+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ $<
- 
- .c.obj:
- @am__fastdepCC_TRUE@	$(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
- @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
- @AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
- @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
--@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(COMPILE) -c `$(CYGPATH_W) '$<'`
-+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
- 
- .c.lo:
- @am__fastdepCC_TRUE@	$(AM_V_CC)$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
diff --git a/x11/gnome-desktop3/patches/patch-libgnome-desktop_libgsystem_gsystem-file-utils.c b/x11/gnome-desktop3/patches/patch-libgnome-desktop_libgsystem_gsystem-file-utils.c
index 388180141c8..7e1a2b4d09c 100644
--- a/x11/gnome-desktop3/patches/patch-libgnome-desktop_libgsystem_gsystem-file-utils.c
+++ b/x11/gnome-desktop3/patches/patch-libgnome-desktop_libgsystem_gsystem-file-utils.c
@@ -1,18 +1,16 @@
-$NetBSD: patch-libgnome-desktop_libgsystem_gsystem-file-utils.c,v 1.3 2014/09/25 15:10:21 prlw1 Exp $
+$NetBSD: patch-libgnome-desktop_libgsystem_gsystem-file-utils.c,v 1.4 2014/11/08 23:15:06 prlw1 Exp $
 
 https://bugzilla.gnome.org/show_bug.cgi?id=737369
 
---- libgnome-desktop/libgsystem/gsystem-file-utils.c.orig	2013-10-04 22:18:43.000000000 +0000
+--- libgnome-desktop/libgsystem/gsystem-file-utils.c.orig	2014-06-03 15:05:13.000000000 +0000
 +++ libgnome-desktop/libgsystem/gsystem-file-utils.c
-@@ -444,7 +444,11 @@ gs_file_open_dir_fd (GFile         *path
+@@ -453,6 +453,9 @@ gs_file_open_dir_fd (GFile         *path
+                      GCancellable  *cancellable,
                       GError       **error)
  {
++#ifndef O_DIRECTORY
++#define O_DIRECTORY 0
++#endif
    /* Linux specific probably */
-+#ifdef O_DIRECTORY
    *out_fd = open (gs_file_get_path_cached (path), O_RDONLY | O_NONBLOCK | O_DIRECTORY | O_CLOEXEC);
-+#else
-+  *out_fd = open (gs_file_get_path_cached (path), O_RDONLY | O_NONBLOCK | O_CLOEXEC);
-+#endif
    if (*out_fd == -1)
-     {
-       _set_error_from_errno (error);
diff --git a/x11/gnome-desktop3/patches/patch-libgnome-desktop_libgsystem_gsystem-shutil.c b/x11/gnome-desktop3/patches/patch-libgnome-desktop_libgsystem_gsystem-shutil.c
index efb663d1621..a02fc3b3e95 100644
--- a/x11/gnome-desktop3/patches/patch-libgnome-desktop_libgsystem_gsystem-shutil.c
+++ b/x11/gnome-desktop3/patches/patch-libgnome-desktop_libgsystem_gsystem-shutil.c
@@ -1,18 +1,16 @@
-$NetBSD: patch-libgnome-desktop_libgsystem_gsystem-shutil.c,v 1.1 2014/09/25 15:10:21 prlw1 Exp $
+$NetBSD: patch-libgnome-desktop_libgsystem_gsystem-shutil.c,v 1.2 2014/11/08 23:15:06 prlw1 Exp $
 
 https://bugzilla.gnome.org/show_bug.cgi?id=737369
 
---- libgnome-desktop/libgsystem/gsystem-shutil.c.orig	2013-10-04 22:18:43.000000000 +0000
+--- libgnome-desktop/libgsystem/gsystem-shutil.c.orig	2014-06-03 15:05:13.000000000 +0000
 +++ libgnome-desktop/libgsystem/gsystem-shutil.c
-@@ -271,7 +271,11 @@ gs_shutil_rm_rf_children (DIR           
+@@ -322,6 +322,9 @@ gs_shutil_rm_rf_children (DIR           
            
        if (dent->d_type == DT_DIR)
          {
-+#ifdef O_DIRECTORY
-           int child_dfd = openat (dfd, dent->d_name, O_RDONLY | O_NONBLOCK | O_DIRECTORY | O_CLOEXEC | O_NOFOLLOW);
-+#else
-+          int child_dfd = openat (dfd, dent->d_name, O_RDONLY | O_NONBLOCK | O_CLOEXEC | O_NOFOLLOW);
++#ifndef O_DIRECTORY
++#define O_DIRECTORY 0
 +#endif
+           int child_dfd = openat (dfd, dent->d_name, O_RDONLY | O_NONBLOCK | O_DIRECTORY | O_CLOEXEC | O_NOFOLLOW);
  
            if (child_dfd == -1)
-             {