24973726 Upgrade xdg-utils to 1.1.1
authorAlan Coopersmith <Alan.Coopersmith@Oracle.COM>
Tue, 29 Nov 2016 13:39:33 -0800
changeset 7421 ff501eb83f43
parent 7420 a5a56b02087b
child 7424 6c7d8df94006
24973726 Upgrade xdg-utils to 1.1.1 PSARC/2016/623 xdg-utils 1.1.1
components/desktop/xdg-utils/Makefile
components/desktop/xdg-utils/patches/0001-xdg-utils-01-bash.patch
components/desktop/xdg-utils/patches/0003-xdg-utils-03-nawk.patch
components/desktop/xdg-utils/patches/0005-xdg-utils-05-CVE-2008-0386.patch
components/desktop/xdg-utils/patches/0006-gnome-screensaver.patch
components/desktop/xdg-utils/patches/01-PATH.patch
components/desktop/xdg-utils/xdg-utils.license
components/desktop/xdg-utils/xdg-utils.p5m
tools/.gnupg/pubring.gpg
--- a/components/desktop/xdg-utils/Makefile	Wed Nov 30 19:29:35 2016 -0800
+++ b/components/desktop/xdg-utils/Makefile	Tue Nov 29 13:39:33 2016 -0800
@@ -25,21 +25,43 @@
 include ../../../make-rules/shared-macros.mk
 
 COMPONENT_NAME=		xdg-utils
-COMPONENT_VERSION=	1.0.2
-COMPONENT_PROJECT_URL=	http://portland.freedesktop.org/download/
-COMPONENT_ARCHIVE=	$(COMPONENT_SRC).tgz
+COMPONENT_VERSION=	1.1.1
+COMPONENT_PROJECT_URL=	https://www.freedesktop.org/wiki/Software/xdg-utils/
 COMPONENT_ARCHIVE_HASH= \
-	sha256:21aeb7d16b2529b8d3975118f59eec09953e09f9a68d718159e98c90474b01ac
-COMPONENT_ARCHIVE_URL=	$(COMPONENT_PROJECT_URL)$(COMPONENT_ARCHIVE)
+	sha256:b0dd63a2576e0bb16f1aa78d6ddf7d6784784a098d4df17161cd6a17c7bc4125
+COMPONENT_ARCHIVE_URL=	http://portland.freedesktop.org/download/$(COMPONENT_ARCHIVE)
+COMPONENT_SIG_URL=      $(COMPONENT_ARCHIVE_URL).asc
 COMPONENT_BUGDB=	gnome/interop
 
-TPNO=			9368	
+TPNO=			32590
 
 # Tests require a window system to be up and running
 TEST_TARGET = $(SKIP_TEST)
 
 include $(WS_MAKE_RULES)/common.mk
 
+# Replaces patches/0001-xdg-utils-01-bash.patch
+COMPONENT_POST_UNPACK_ACTION += \
+    $(GSED) -i -e 's,^\#!/bin/sh$$,\#!/usr/bin/bash,' $(@D)/scripts/*.in
+
+# Cannot find desc/*.xml during build if tree isn't cloned
 COMPONENT_PRE_CONFIGURE_ACTION = ($(CLONEY) $(SOURCE_DIR) $(@D))
 
+# Use GNU awk & sed
+CONFIGURE_ENV += PATH="$(GNUBIN):$(PATH)"
+COMPONENT_BUILD_ENV += PATH="$(GNUBIN):$(PATH)"
+
+# docbook-dtds, xsltproc, & xmlto are used to generate files during the build
+REQUIRED_PACKAGES += data/docbook/docbook-dtds
+REQUIRED_PACKAGES += developer/documentation-tool/xmlto
+REQUIRED_PACKAGES += file/gnu-coreutils
+REQUIRED_PACKAGES += gnome/config/gconf
+REQUIRED_PACKAGES += gnome/zenity
+REQUIRED_PACKAGES += library/gnome/gvfs
+REQUIRED_PACKAGES += library/libxslt
 REQUIRED_PACKAGES += shell/bash
+REQUIRED_PACKAGES += system/library/dbus
+REQUIRED_PACKAGES += text/gawk
+REQUIRED_PACKAGES += text/gnu-grep
+REQUIRED_PACKAGES += text/gnu-sed
+REQUIRED_PACKAGES += x11/x11-server-utilities
--- a/components/desktop/xdg-utils/patches/0001-xdg-utils-01-bash.patch	Wed Nov 30 19:29:35 2016 -0800
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,66 +0,0 @@
-Existing set of desktop patches
-Not suitable for upstream
-
-diff -r d75a7365fc3b scripts/xdg-desktop-icon
---- a/scripts/xdg-desktop-icon	Sun Sep 30 18:38:14 2007 +0530
-+++ b/scripts/xdg-desktop-icon	Sun Sep 30 18:39:32 2007 +0530
-@@ -1,4 +1,4 @@
--#!/bin/sh
-+#!/usr/bin/bash
- #---------------------------------------------
- #   xdg-desktop-icon
- #
-diff -r d75a7365fc3b scripts/xdg-desktop-menu
---- a/scripts/xdg-desktop-menu	Sun Sep 30 18:38:14 2007 +0530
-+++ b/scripts/xdg-desktop-menu	Sun Sep 30 18:39:36 2007 +0530
-@@ -1,4 +1,4 @@
--#!/bin/sh
-+#!/usr/bin/bash
- #---------------------------------------------
- #   xdg-desktop-menu
- #
-diff -r d75a7365fc3b scripts/xdg-email
---- a/scripts/xdg-email	Sun Sep 30 18:38:14 2007 +0530
-+++ b/scripts/xdg-email	Sun Sep 30 18:39:39 2007 +0530
-@@ -1,4 +1,4 @@
--#!/bin/sh
-+#!/usr/bin/bash
- #---------------------------------------------
- #   xdg-email
- #
-diff -r d75a7365fc3b scripts/xdg-icon-resource
---- a/scripts/xdg-icon-resource	Sun Sep 30 18:38:14 2007 +0530
-+++ b/scripts/xdg-icon-resource	Sun Sep 30 18:39:41 2007 +0530
-@@ -1,4 +1,4 @@
--#!/bin/sh
-+#!/usr/bin/bash
- #---------------------------------------------
- #   xdg-icon-resource
- #
-diff -r d75a7365fc3b scripts/xdg-mime
---- a/scripts/xdg-mime	Sun Sep 30 18:38:14 2007 +0530
-+++ b/scripts/xdg-mime	Sun Sep 30 18:39:43 2007 +0530
-@@ -1,4 +1,4 @@
--#!/bin/sh
-+#!/usr/bin/bash
- #---------------------------------------------
- #   xdg-mime
- #
-diff -r d75a7365fc3b scripts/xdg-open
---- a/scripts/xdg-open	Sun Sep 30 18:38:14 2007 +0530
-+++ b/scripts/xdg-open	Sun Sep 30 18:39:48 2007 +0530
-@@ -1,4 +1,4 @@
--#!/bin/sh
-+#!/usr/bin/bash
- #---------------------------------------------
- #   xdg-open
- #
-diff -r d75a7365fc3b scripts/xdg-screensaver
---- a/scripts/xdg-screensaver	Sun Sep 30 18:38:14 2007 +0530
-+++ b/scripts/xdg-screensaver	Sun Sep 30 18:39:53 2007 +0530
-@@ -1,4 +1,4 @@
--#!/bin/sh
-+#!/usr/bin/bash
- #---------------------------------------------
- #   xdg-screensaver
- #
--- a/components/desktop/xdg-utils/patches/0003-xdg-utils-03-nawk.patch	Wed Nov 30 19:29:35 2016 -0800
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,105 +0,0 @@
-Existing set of desktop patches
-Not suitable for upstream
-
-diff -up xdg-utils-1.0.2/scripts/xdg-desktop-menu.orig xdg-utils-1.0.2/scripts/xdg-desktop-menu
---- xdg-utils-1.0.2/scripts/xdg-desktop-menu.orig	2008-02-13 12:19:40.000000000 +0000
-+++ xdg-utils-1.0.2/scripts/xdg-desktop-menu	2008-02-13 12:32:47.396025000 +0000
-@@ -641,7 +641,7 @@ update_desktop_database()
- fixup_mandriva_categories()
- {
-     DEBUG 1 "fixup_mandriva_categories $1"
--    awk '
-+    nawk '
- BEGIN {
-     xlat["AudioVideo"]="X-Mandrakelinux-Multimedia;X-MandrivaLinux-Multimedia"
-     xlat["Development"]="X-Mandrakelinux-MoreApplications-Development;X-MandrivaLinux-MoreApplications-Development"
-@@ -685,7 +685,7 @@ make_lazy_default()
-     local xdg_default_dirs
-     
-     DEBUG 1 "make_lazy_default $1/$2"
--    mimetypes=`awk '
-+    mimetypes=`nawk '
- {
-     if (match($0,/MimeType=/)) {
-         split(substr($0,RSTART+9),mimetypes,";")
-@@ -832,7 +832,7 @@ update_submenu()
-     tmpfile=`mktemp $TMPDIR/tmp.XXXXXXXXXX`
-     orig_desktop_files=
-     if [ -r "$orig_menu_file" ] ; then
--        awk '
-+        nawk '
- # List all files within <Filename> tags
- BEGIN {
-   RS="<"
-@@ -926,7 +926,7 @@ BEGIN {
-         tmpfile=`mktemp $TMPDIR/tmp.XXXXXXXXXX`
-         for menu_file in $xdg_dir/*; do
-             if grep 'generated and managed by xdg-desktop-menu' $menu_file > /dev/null 2> /dev/null; then
--                awk '
-+                nawk '
- # List all files within <Directory> tags
- BEGIN {
-   RS="<"
-
-diff -up xdg-utils-1.0.2/scripts/xdg-email.orig xdg-utils-1.0.2/scripts/xdg-email
---- xdg-utils-1.0.2/scripts/xdg-email.orig	2008-02-13 12:19:40.000000000 +0000
-+++ xdg-utils-1.0.2/scripts/xdg-email	2008-02-13 12:32:52.343450000 +0000
-@@ -454,7 +454,7 @@ open_generic()
- 
- url_encode()
- {
--result=$(echo "$1" | $utf8 | awk '
-+result=$(echo "$1" | $utf8 | nawk '
-     BEGIN {
-         for ( i=1; i<=255; ++i ) ord [ sprintf ("%c", i) "" ] = i + 0
-         e = ""
-
-diff -up xdg-utils-1.0.2/scripts/xdg-mime.orig xdg-utils-1.0.2/scripts/xdg-mime
---- xdg-utils-1.0.2/scripts/xdg-mime.orig	2008-02-13 12:19:40.000000000 +0000
-+++ xdg-utils-1.0.2/scripts/xdg-mime	2008-02-13 12:32:56.308218000 +0000
-@@ -508,7 +508,7 @@ make_default_kde()
-     DEBUG 1 "Updating $default_file"
-     mkdir -p "$HOME/.kde/share/config"
-     [ -f $default_file ] || touch $default_file
--    awk -v application="$1" -v mimetype="$2" '
-+    nawk -v application="$1" -v mimetype="$2" '
-     BEGIN {
-         header_start="[" mimetype " - "
-         supress=0
-@@ -894,7 +894,7 @@ mimetypes=
- if [ -n "$kde_dir" ] ; then
-     DEBUG 2 "KDE3 mimelnk directory found, extracting mimetypes from XML file"
- 
--    mimetypes=`awk < "$filename" '
-+    mimetypes=`nawk < "$filename" '
- # Strip XML comments
- BEGIN {
-  supress=0
-@@ -923,7 +923,7 @@ BEGIN {
-     }
-  while(1)
- }
--' | awk '
-+' | nawk '
- # List MIME types listed in <mime-type> tags
- BEGIN {
-   RS="<"
-@@ -954,7 +954,7 @@ case $action in
-             for x in $mimetypes ; do 
-                 DEBUG 1 "Installing $kde_dir/$x.desktop (KDE 3.x support)"
-                 mkdir -p `dirname $kde_dir/$x.desktop`
--                awk < "$filename" '
-+                nawk < "$filename" '
- # Strip XML comments
- BEGIN {
-  supress=0
-@@ -983,7 +983,7 @@ BEGIN {
-     }
-  while(1)
- }
--' | awk > $kde_dir/$x.desktop '
-+' | nawk > $kde_dir/$x.desktop '
- # Extract mimetype $x from the XML file $filename
- # Note that bash requires us to escape a single quote as '"'"' 
- BEGIN {
-
--- a/components/desktop/xdg-utils/patches/0005-xdg-utils-05-CVE-2008-0386.patch	Wed Nov 30 19:29:35 2016 -0800
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,30 +0,0 @@
-Existing set of desktop patches
-When we update to a version from upstream that has this fix, this
-can be dropped
-
---- xdg-utils-1.0.2/scripts/xdg-email.orig	2013-09-16 16:47:36.187915000 +0530
-+++ xdg-utils-1.0.2/scripts/xdg-email	2013-09-16 16:49:52.658651000 +0530
-@@ -438,8 +438,8 @@ open_generic()
-     for browser in $BROWSER; do
-         if [ x"$browser" != x"" ]; then
- 
--            browser_with_arg=`echo "$browser" | sed s#%s#"$1"#`
--
-+            IFS=' '
-+            browser_with_arg=${browser//'%s'/"$1"}
-             if [ x"$browser_with_arg" = x"$browser" ]; then "$browser" "$1";
-             else $browser_with_arg;
-             fi
---- xdg-utils-1.0.2/scripts/xdg-open.orig	2013-09-16 16:50:17.667487000 +0530
-+++ xdg-utils-1.0.2/scripts/xdg-open	2013-09-16 16:51:03.313433000 +0530
-@@ -367,8 +367,8 @@ open_generic()
-     for browser in $BROWSER; do
-         if [ x"$browser" != x"" ]; then
- 
--            browser_with_arg=`echo "$browser" | sed s#%s#"$1"#`
--
-+            IFS=' '
-+            browser_with_arg=${browser//'%s'/"$1"}
-             if [ x"$browser_with_arg" = x"$browser" ]; then "$browser" "$1";
-             else $browser_with_arg;
-             fi
--- a/components/desktop/xdg-utils/patches/0006-gnome-screensaver.patch	Wed Nov 30 19:29:35 2016 -0800
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,164 +0,0 @@
-Backport of changes from upstream git repo to support GNOME 3 screensaver.
-
-Should be removable when we upgrade to xdg-utils 1.1.0 or later.
-
---- a/scripts/xdg-screensaver
-+++ b/scripts/xdg-screensaver
-@@ -417,8 +417,8 @@ perform_action()
-       screensaver_kde "$1"
-       ;;
- 
--    gnome)
--      screensaver_gnome "$1"
-+    gnome_screensaver)
-+      screensaver_gnome_screensaver "$1"
-       ;;
- 
-     xscreensaver)
-@@ -611,17 +611,59 @@ screensaver_suspend_loop()
-   (while [ -f "$screensaver_file" ]; do $*; sleep 59; done) > /dev/null 2> /dev/null &
- }
- 
--screensaver_gnome()
-+screensaver_gnome_screensaver()
- {
--# TODO
--# There seems to be a DBUS interface for gnome-screensaver
--# See http://lists.mplayerhq.hu/pipermail/mplayer-dev-eng/2006-April/042579.html and
--# http://cvs.gnome.org/viewcvs/gnome-screensaver/src/gs-listener-dbus.c?rev=1.36&view=log
--# A problem seems to be that Inhibit is tied to the lifetime of the DBUS appname and
--# this can not be used from a script
-+# DBUS interface for gnome-screensaver
-+# http://people.gnome.org/~mccann/gnome-screensaver/docs/gnome-screensaver.html
-     case "$1" in
--        suspend) 
--        screensaver_suspend_loop gnome-screensaver-command --poke
-+        suspend)
-+        perl -e '
-+use strict;
-+use warnings;
-+use IO::File;
-+use Net::DBus;
-+use X11::Protocol;
-+
-+my ($window_id, $screensaver_file) = @ARGV;
-+
-+# Find window name to pass to session manager.
-+my $x = X11::Protocol->new();
-+my $named_window_id = hex($window_id);
-+my $window_name;
-+while (1) {
-+  ($window_name) = $x->GetProperty($named_window_id, $x->atom("WM_NAME"),
-+				   $x->atom("STRING"), 0, 1000, 0);
-+  last if defined($window_name) && $window_name ne "";
-+  (undef, $named_window_id) = $x->QueryTree($named_window_id);
-+  if (!defined($named_window_id)) {
-+    $window_name = "?";
-+    last;
-+  }
-+}
-+
-+# Inhibit idle detection (flags = 8) with window name and ID.
-+# We have no reason so just send the window name again.
-+my $bus = Net::DBus->session();
-+my $sm_svc = $bus->get_service("org.gnome.SessionManager");
-+my $sm = $sm_svc->get_object("/org/gnome/SessionManager",
-+			     "org.gnome.SessionManager");
-+$sm->Inhibit($window_name, hex($window_id), $window_name, 8);
-+
-+# Wait until removed from the status file.
-+while (1) {
-+  sleep(10);
-+  my $status = new IO::File($screensaver_file, "r")
-+    or exit 0;
-+  my $found;
-+  while (<$status>) {
-+    if (/^$window_id:/) {
-+      $found = 1;
-+      last;
-+    }
-+  }
-+  exit 0 unless $found;
-+}
-+' $window_id $screensaver_file &
-         result=0
-         ;;
- 
-@@ -631,27 +673,52 @@ screensaver_gnome()
-         ;;
-         
-         activate)
--        gnome-screensaver-command --activate > /dev/null 2> /dev/null
-+        dbus-send --session \
-+                  --dest=org.gnome.ScreenSaver \
-+                  --type=method_call \
-+                  /org/gnome/ScreenSaver \
-+                  org.gnome.ScreenSaver.SetActive \
-+                  boolean:true \
-+                  2> /dev/null
-         result=$?
-         ;;
-         
-         lock)
--        gnome-screensaver-command --lock > /dev/null 2> /dev/null
-+        dbus-send --session \
-+                  --dest=org.gnome.ScreenSaver \
-+                  --type=method_call \
-+                  /org/gnome/ScreenSaver \
-+                  org.gnome.ScreenSaver.Lock \
-+                  2> /dev/null
-         result=$?
-         ;;
-         
-         reset)
-         # Turns the screensaver off right now
--        gnome-screensaver-command --deactivate > /dev/null 2> /dev/null
-+        dbus-send --session \
-+                  --dest=org.gnome.ScreenSaver \
-+                  --type=method_call \
-+                  /org/gnome/ScreenSaver \
-+                  org.gnome.ScreenSaver.SimulateUserActivity \
-+                 2> /dev/null
-         result=$?
-         ;;
- 
-         status)
--        result=0
--        if [ -f "$screensaver_file" ] ; then
--            echo "disabled"
--        elif gnome-screensaver-command --query > /dev/null 2> /dev/null; then
-+        status=`dbus-send --session \
-+                          --dest=org.gnome.ScreenSaver \
-+                          --type=method_call \
-+                          --print-reply \
-+                          --reply-timeout=2000 \
-+                          /org/gnome/ScreenSaver \
-+                          org.gnome.ScreenSaver.GetActive \
-+                          | grep boolean | cut -d ' ' -f 5`
-+        result=$?
-+        if [ x"$status" = "xtrue" -o x"$status" = "xfalse" ]; then
-             echo "enabled"
-+        elif [ x"$result" != "x0" ]; then
-+            echo "ERROR: dbus org.gnome.ScreenSaver.GetActive returned '$status'" >&2
-+            return 1
-         else
-             # Something is wrong
-             echo "disabled"
-@@ -659,7 +726,7 @@ screensaver_gnome()
-         ;;
- 
-         *)
--        echo "ERROR:  Unknown command '$1" >&2
-+        echo "ERROR: Unknown command '$1" >&2
-         return 1
-         ;;
-     esac
-@@ -766,6 +833,8 @@ esac
- detectDE
- # Consider "xscreensaver" a separate DE
- xscreensaver-command -version 2> /dev/null | grep XScreenSaver > /dev/null && DE="xscreensaver"
-+# Consider "gnome-screensaver" a separate DE
-+dbus-send --print-reply --dest=org.freedesktop.DBus /org/freedesktop/DBus org.freedesktop.DBus.GetNameOwner string:org.gnome.ScreenSaver > /dev/null 2>&1 && DE="gnome_screensaver"
- 
- if [ "$action" = "resume" ] ; then
-     do_resume
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/components/desktop/xdg-utils/patches/01-PATH.patch	Tue Nov 29 13:39:33 2016 -0800
@@ -0,0 +1,12 @@
+Scripts assume gnu versions of grep, awk, etc. so put /usr/gnu/bin first in
+the $PATH on Solaris.
+
+Not suitable for upstream.
+
+--- xdg-utils-1.1.1/scripts/xdg-utils-common.in
++++ xdg-utils-1.1.1/scripts/xdg-utils-common.in
+@@ -1,3 +1,4 @@
++export PATH="/usr/gnu/bin:/usr/bin:${PATH:-/usr/bin}"
+ 
+ #----------------------------------------------------------------------------
+ #   Common utility functions included in all XDG wrapper scripts
--- a/components/desktop/xdg-utils/xdg-utils.license	Wed Nov 30 19:29:35 2016 -0800
+++ b/components/desktop/xdg-utils/xdg-utils.license	Tue Nov 29 13:39:33 2016 -0800
@@ -1,18 +1,25 @@
-Open Source Initiative OSI - The MIT License:Licensing
-The MIT License
-Copyright (c) <year> <copyright holders>
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-THE SOFTWARE.
+Copyright 2006, Benedikt Meurer <[email protected]>
+Copyright 2006, Bryce Harrington <[email protected]>
+Copyright 2006, Jeremy White <[email protected]>
+Copyright 2006, Kevin Krammer <[email protected]>
+Copyright 2009-2010, Fathi Boudra <[email protected]>
+Copyright 2009-2010, Rex Dieter <[email protected]>
+Copyright 2009, Google Inc.
+
+Permission is hereby granted, free of charge, to any person obtaining a
+copy of this software and associated documentation files (the "Software"),
+to deal in the Software without restriction, including without limitation
+the rights to use, copy, modify, merge, publish, distribute, sublicense,
+and/or sell copies of the Software, and to permit persons to whom the
+Software is furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included
+in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
+THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR
+OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
+ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
+OTHER DEALINGS IN THE SOFTWARE.
--- a/components/desktop/xdg-utils/xdg-utils.p5m	Wed Nov 30 19:29:35 2016 -0800
+++ b/components/desktop/xdg-utils/xdg-utils.p5m	Tue Nov 29 13:39:33 2016 -0800
@@ -34,7 +34,7 @@
     value="org.opensolaris.category.2008:Applications/System Utilities"
 set name=info.source-url value=$(COMPONENT_ARCHIVE_URL)
 set name=info.upstream-url value=$(COMPONENT_PROJECT_URL)
-set name=org.opensolaris.arc-caseid value=PSARC/2010/143
+set name=org.opensolaris.arc-caseid value=LSARC/2008/104 value=PSARC/2016/623
 set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
 file path=usr/bin/xdg-desktop-icon
 file path=usr/bin/xdg-desktop-menu
@@ -43,6 +43,7 @@
 file path=usr/bin/xdg-mime
 file path=usr/bin/xdg-open
 file path=usr/bin/xdg-screensaver
+file path=usr/bin/xdg-settings
 file path=usr/share/man/man1/xdg-desktop-icon.1
 file path=usr/share/man/man1/xdg-desktop-menu.1
 file path=usr/share/man/man1/xdg-email.1
@@ -50,4 +51,19 @@
 file path=usr/share/man/man1/xdg-mime.1
 file path=usr/share/man/man1/xdg-open.1
 file path=usr/share/man/man1/xdg-screensaver.1
+file path=usr/share/man/man1/xdg-settings.1
 license xdg-utils.license license=MIT
+
+# Programs required by various scripts in this package
+
+depend type=require fmri=__TBD pkg.debug.depend.file=usr/bin/dbus-send
+depend type=require fmri=__TBD pkg.debug.depend.file=usr/bin/gconftool-2
+depend type=require fmri=__TBD pkg.debug.depend.file=usr/bin/gvfs-info
+depend type=require fmri=__TBD pkg.debug.depend.file=usr/bin/gvfs-open
+depend type=require fmri=__TBD pkg.debug.depend.file=usr/bin/readlink
+depend type=require fmri=__TBD pkg.debug.depend.file=usr/bin/xprop
+depend type=require fmri=__TBD pkg.debug.depend.file=usr/bin/xset
+depend type=require fmri=__TBD pkg.debug.depend.file=usr/bin/zenity
+depend type=require fmri=__TBD pkg.debug.depend.file=usr/gnu/bin/awk
+depend type=require fmri=__TBD pkg.debug.depend.file=usr/gnu/bin/grep
+depend type=require fmri=__TBD pkg.debug.depend.file=usr/gnu/bin/sed
Binary file tools/.gnupg/pubring.gpg has changed