diff options
author | wiz <wiz@pkgsrc.org> | 2015-10-15 10:53:35 +0000 |
---|---|---|
committer | wiz <wiz@pkgsrc.org> | 2015-10-15 10:53:35 +0000 |
commit | 0925f5bf187e9c81ec8bf63b5d6f47f7b27982aa (patch) | |
tree | ef1133ea18f880f5e4e47427f84d42a7dc84c0c8 /misc/xdg-utils | |
parent | 6aadd7d88a4d27f214dc2a2139bc3ca910f2bfce (diff) | |
download | pkgsrc-0925f5bf187e9c81ec8bf63b5d6f47f7b27982aa.tar.gz |
Update xdg-utils to 1.1.1:
=== xdg-utils 1.1.1 ===
2015-10-05 Per Olofsson <pelle@debian.org>
* xdg-screensaver: Run 'xset -dpms' and then 'xset +dpms' to reset
the DPMS timer. Thanks to Stephen Thomas for the idea.
(Debian bug #745340)
* xdg-open: Fix regression in generic mode (wrong variable name) which
prevented files from being opened using the desktop file/mimeapps.list
mechanism.
* xdg-open: Add proper quoting so that files with spaces in their names
can be opened in generic mode and LXDE. (Debian bug #801048)
=== xdg-utils 1.1.0 ===
2015-10-04 Per Olofsson <pelle@debian.org>
* Add references to specifications to the manuals. (Debian bug #800826)
* xdg-email: Remove obsolete references to
http://portland.freedesktop.org/wiki/EmailConfig from the manual.
2015-10-03 Per Olofsson <pelle@debian.org>
* xdg-email: Rewrite open_kde()
* xdg-open: Only strip queries (?) and fragments (#) from file URLs before
decoding them, not from (decoded) paths. Otherwise we can't open files
with hash or question marks in their names. (Debian bug #800355)
2015-09-27 Per Olofsson <pelle@debian.org>
* xdg-settings: Detect generic DE instead of failing. (Debian bug #787791)
* xdg-settings: Add a proper generic mode.
2015-09-26 Per Olofsson <pelle@debian.org>
* xdg-mime: Check ~/.config/mimeapps.list instead of
~/.config/applications/mimeapps.list when looking for default
application.
* xdg-open: Fall back to generic mode if gvfs-open and gnome-open
are missing. Don't try to use gnome-open if running under GNOME 3 or
Cinnamon. (Debian bug #685304)
* xdg-open, xdg-email: Add iceweasel to the list of fallback browsers.
(Debian bug #788047)
2015-09-25 Per Olofsson <pelle@debian.org>
* xdg-utils-common: Add support for $XDG_CURRENT_DESKTOP value X-Generic.
When set, xdg-utils will pretend that it is running under a generic DE
which can be useful for debugging purposes.
2015-09-23 Per Olofsson <pelle@debian.org>
* xdg-open: Percent-decode file:// URLs in open_lxde and add testcase.
(BR89654)
2015-09-22 Per Olofsson <pelle@debian.org>
* Add a fully automated (non-interactive) test suite (under development).
Run it using "make autotest".
* xdg-screensaver: Use the DBus API from a Perl script to inhibit
gnome-screensaver. This is necessary since the SimulateUserActivity call
is not implemented. Calling Inhibit using dbus-send does not work either
since gnome-screensaver watches the pid of the calling process and
dbus-send exits immediately. Distributions are advised to make xdg-utils
depend on the Perl modules Net::DBus and X11::Protocol. Thanks to
Ben Hutchings for writing the Perl script.
* xdg-email: Add support for the $MAILER environment variable.
* xdg-open: Add support for running without X.
* xdg-open: Try www-browser first of the non-X browsers. (www-browser is
a symlink to the preferred non-X browser in Debian.)
* xdg-icon-resource: Don't try to install anything into empty $icon_dir's.
2015-09-20 Per Olofsson <pelle@debian.org>
* xdg-open: Try $BROWSER first in generic mode if it is set by the user.
2015-09-18 Rex Dieter <rdieter@fedoraproject.org>
* xdg-email: Recipients passed to Thunderbird are incorrectly quoted (BR91996)
2015-09-16 Rex Dieter <rdieter@fedoraproject.org>
* xdg-screensaver support for xautolock (BR89655)
* xdg-icon-resource: does not support filenames with spaces (BR91758)
* xdg-open: Add support for multi-word $BROWSER commands (BR91989)
* xdg-open shell script contains bash code (BR86028)
* xdg-email: bashism: relies on bash's echo in run_thunderbird() (BR91990)
* xdg-email: Icedove support (BR91997)
* xdg-email: generic mode does nothing (BR92008)
2015-07-15 Rex Dieter <rdieter@fedoraproject.org>
* better for other (non-gnome) GVfs-based desktops, from Yaakov Selkowitz <yselkowi@redhat.com>
2015-07-01 Rex Dieter <rdieter@fedoraproject.org>
* xdg-email: generic check for assigned mailto (BR79929)
2015-04-13 Rex Dieter <rdieter@fedoraproject.org>
* xdg-mime: search mimeinfo.cache in $xdg_user_dir too (BR31629)
2015-04-06 Rex Dieter <rdieter@fedorparoject.org>
* xdg-open: does not exit if it does not recognize the mimetype (BR89902)
2015-04-04 Rex Dieter <rdieter@fedoraproject.org>
* xdg-desktop-menu: does not support filenames with spaces (BR66605)
2015-03-23 Rex Dieter <rdieter@fedoraproject.org>
* xdg-open: fix regression where & gets replaced with \\& in URLs
2015-03-02 Rex Dieter <rdieter@fedoraproject.org>
* xdg-email: thunderbird launch in xdg-email in gnome3 fails (BR61475)
2015-02-24 Lionel Orry <lionel.orry@gmail.com>
* xdg-mime: do not report multiple desktop files (BR60329)
2015-02-20 Rex Dieter <rdieter@fedoraproject.org>
* xdg-open: safer xdg-open (BR89130), inspired by patch from Vincent Bernat <bernat@debian.org>
2015-01-19 Rex Dieter <rdieter@fedoraproject.org>
* xdg-open: better fix for command injection vulnerability (BR66670)
* xdg-open is extremely slow because get_key executes grep unnecessarily (BR88524)
2015-01-15 Reuben Thomas <rrt@sc3d.org>
* xdg-mime: dereference symlinks when using mimetype or file (BR39923)
* xdg-screensaver: Change screensaver_freedesktop's interpretation of GetActive (BR29859)
2015-01-05 Rex Dieter <rdieter@fedoraproject.org>
* xdg-open: command injection vulnerability (BR66670)
2015-01-04 Rex Dieter <rdieter@fedoraproject.org>
* xdg-screensaver should control X11's screensaver in xfce as fallback (BR80089)
2014-10-09 Rex Dieter <rdieter@fedoraproject.org>
* xdg-screensaver plasma5 support
2014-09-22 Rex Dieter <rdieter@fedoraproject.org>
* Initial support for Plasma5 (largely thanks to Karol Herbst)
2014-09-19 Rex Dieter <rdieter@fedoraproject.org>
* XFCE .desktop file created for browser selection is broken (BR56092)
* Unnecessary filtering file:// for pcmanfm (BR63153)
* fails if user sets a custom IFS environment variable (BR81386)
2014-09-17 Rex Dieter <rdieter@fedoraproject.org>
* xdg-utils-common is broken, xdg-open uses bashism (BR83979)
2014-08-25 Rex Dieter <rdieter@fedoraproject.org>
* xdg-email: do not encode - character
2014-04-26 Rex Dieter <rdieter@fedoraproject.org>
* xdg-open fails to open web browser urls with a query string (BR45857)
2014-02-07 Rex Dieter <rdieter@fedoraproject.org>
* Improvement of detecting KDE session (BR63157)
2013-10-24 Rex Dieter <rdieter@fedoraproject.org>
* xdg-desktop-menu: improperly check for vendor prefix on Estonian locale (BR70742)
2013-09-16 Rex Dieter <rdieter@fedoraproject.org>
* xdg-desktop-menu: Unquoted file name (BR69399)
2013-07-13 Igor Murzov <e-mail@date.by>
* xdg-open: detect Enlightenment and make use of it (BR66944)
2012-10-08 Rex Dieter <rdieter@fedoraproject.org>
* xdg-mime does not search mimeinfo.cache (BR31629)
2012-09-16 Rex Dieter <rdieter@fedoraproject.org>
* recognize XDG_CURRENT_DESKTOP/DESKTOP_SESSION=MATE (BR54941)
* xdg-su: use gnomesu for mate (BR54941)
2012-08-20 Rex Dieter <rdieter@fedoraproject.org>
* xdg-su: stop checking xsu (thanks to Jiri Slaby)
* xdg-su: use gnomesu for xfce if available (thanks to Jiri Slaby)
2012-08-09 Rex Dieter <rdieter@fedoraproject.org>
* xdg-open fails to open a url in a "generic" environment (BR45859)
* xdg-screensaver syntax error if DISPLAY isn't set (BR41144)
* do not check for /etc/debian_version before using xdg-open (BR46814)
* Setting $BROWSER=xdg-open can cause infinite loop (BR44047)
2012-03-10 Rex Dieter <rdieter@fedoraproject.org>
* allow DESKTOP_SESSION='Xfce Session' to match xfce
2012-03-02 Rex Dieter <rdieter@fedoraproject.org>
* "unknown DE" improvements (BR45295)
* xdg-terminal incompatible with TERM=screen and TERM=rxvt-unicode (BR44357)
* xdg-terminal doesn't handle TERM values like TERM=linux (BR44358)
* add lubuntu support (BR44775)
* xdg-open replaces "&" with "%U" in URLs (BR46002)
2011-12-09 Rex Dieter <rdieter@fedoraproject.org>
* initial DE=mate support (mostly just xdg-open so far)
2011-12-07 Rex Dieter <rdieter@fedoraproject.org>
* xdg-screensaver: gnome-screensaver detection broken (BR43575)
* xdg-open: fix spurious 'x-www-browser: command not found' (RH755553)
2011-09-30 Rex Dieter <rdieter@fedoraproject.org>
* xdg-open: use x-scheme-handler/ instead of uri/ (BR35700)
2011-09-28 Rex Dieter <rdieter@fedoraproject.org>
* Documentation spelling fixes (BR41193). Thanks to Ville Skyttä
* Fix external links in docs, use <ulink> for them (BR41194). Thanks to
Ville Skyttä
* Avoid some unnecessary stat calls (BR41195). Thanks to Ville Skyttä
* xdg-open: improve debugging output (BR40959)
* xdg-open: look up default applications by URI scheme (BR35700)
* xdg-settings: support registering default scheme handler (merge from
chromium folks)
2011-08-29 Rex Dieter <rdieter@fedoraproject.org>
* xdg-open cant open some valid urls if URL doesnt match existing
filename (BR34915). Thanks to Leho Kraav.
2011-08-27 Rex Dieter <rdieter@fedoraproject.org>
* xdg-terminal fails to open terminal on generic desktop (BR40418)
2011-08-12 Rex Dieter <rdieter@fedoraproject.org>
* xdg-email fails with unicode strings if using gawk (BR13139)
* xdg-email: Thunderbird 5 needs unescaped addresses (BR40041)
2011-08-11 Rex Dieter <rdieter@fedoraproject.org>
* xdg-terminal : remove remaining '==' bash'isms (BR38959)
2011-07-19 Rex Dieter <rdieter@fedoraproject.org>
* xdg-utils-common.in: support $XDG_CURRENT_DESKTOP
2011-07-13 Rex Dieter <rdieter@fedoraproject.org>
* xdg-mime : use 'file --mime-type' instead of 'file -i' (BR39166)
2011-05-10 Rex Dieter <rdieter@fedoraproject.org>
* xdg-mime : handle home dirs with spaces, mimeapps.list not existing. Thanks to Mike Mammarella.
2011-05-05 Rex Dieter <rdieter@fedoraproject.org>
* xdg-utils-common.in : add missing ;;
2011-05-04 Rex Dieter <rdieter@fedoraproject.org>
* xdg-utils-common.in : move a couple of utility functions here (from
xdg-settings), needed for xdg-email
* xdg-utils-common.in : binary_to_desktop_file, handle vendor dirs
2011-04-20 Rex Dieter <rdieter@fedoraproject.org>
* xdg-desktop-icon does not work when user desktop dir has spaces (BR36417)
2011-04-14 Rex Dieter <rdieter@fedoraproject.org>
* xdg-open does not detect xfce (BR25941)
* xdg-open's list of fallback browsers excludes seamonkey (BR33699)
* text BROWSER=+elinks
* xdg-open is sensitive to default grep options (BR34164)
* xdg-{open,email} should try x-www-browser (BR33095)
* xdg-email outputs errors with localized KDE4 (BR32924)
* xdg-email runs kmailservice with incorrect locale (BR33106)
* spurious capture of which in KMIMETYPEFINDER (BR31444)
2011-04-12 Rex Dieter <rdieter@fedoraproject.org>
* suppress 'which gnome-default-applications-properties' output. Thanks to Mike Mammarella.
2011-04-08 Rex Dieter <rdieter@fedoraproject.org>
* xdg-mime: add mimeapps.list support. Thanks to Chris Coulson.
2011-03-31 Rex Dieter <rdieter@fedoraproject.org>
* Don't overwrite a /usr/share/applications/defaults.list symlink (BR35794)
* Use D-Bus API for GNOME screensaver (BR29860)
* Initial support for DE=Darwin, Default for $BROWSER under Mac OS (BR35500)
2011-03-28 Rex Dieter <rdieter@fedoraproject.org>
* xdg-open cannot detect xfce 4.8 correctly (BR33321)
* xdg-mime's info_generic doesn't normalize symlinks (BR33097)
* mimetype support for xdg-mime (generic) (BR33094)
* open_generic_xdg_mime is broken when a .desktop file
Exec has arguments (BR30453)
2011-02-01 Rex Dieter <rdieter@fedoraproject.org>
* add support for GNOME 3.x
2011-01-09 Fathi Boudra <fabo@freedesktop.org>
* xdg-email: call kfmclient_fix_exit_code() under KDE 3 only.
Thanks to Luc Menut. (BR32924)
* xdg-utils-common: set C.UTF-8 locale to make sure the version parsing is
done as expected. Under some locales the KDE version string doesn't start
with "KDE".
* xdg-terminal: Fix failure because the which std output is wrongly
redirected to /dev/null in terminal_kde(). Thanks to Luc Menut.
(BR32927)
Diffstat (limited to 'misc/xdg-utils')
-rw-r--r-- | misc/xdg-utils/Makefile | 19 | ||||
-rw-r--r-- | misc/xdg-utils/distinfo | 17 | ||||
-rw-r--r-- | misc/xdg-utils/patches/patch-scripts_xdg-desktop-icon | 13 | ||||
-rw-r--r-- | misc/xdg-utils/patches/patch-scripts_xdg-desktop-menu | 13 | ||||
-rw-r--r-- | misc/xdg-utils/patches/patch-scripts_xdg-email | 13 | ||||
-rw-r--r-- | misc/xdg-utils/patches/patch-scripts_xdg-icon-resource | 13 | ||||
-rw-r--r-- | misc/xdg-utils/patches/patch-scripts_xdg-mime | 13 | ||||
-rw-r--r-- | misc/xdg-utils/patches/patch-scripts_xdg-open | 13 | ||||
-rw-r--r-- | misc/xdg-utils/patches/patch-scripts_xdg-screensaver | 13 | ||||
-rw-r--r-- | misc/xdg-utils/patches/patch-scripts_xdg-settings | 13 |
10 files changed, 12 insertions, 128 deletions
diff --git a/misc/xdg-utils/Makefile b/misc/xdg-utils/Makefile index c78c82e6f73..97775ddeb05 100644 --- a/misc/xdg-utils/Makefile +++ b/misc/xdg-utils/Makefile @@ -1,8 +1,7 @@ -# $NetBSD: Makefile,v 1.7 2014/04/21 15:35:27 wiz Exp $ +# $NetBSD: Makefile,v 1.8 2015/10/15 10:53:35 wiz Exp $ -DISTNAME= xdg-utils-1.1.0-rc1 +DISTNAME= xdg-utils-1.1.1 PKGNAME= ${DISTNAME:S/-rc/rc/} -PKGREVISION= 1 CATEGORIES= sysutils MASTER_SITES= http://portland.freedesktop.org/download/ @@ -11,9 +10,12 @@ HOMEPAGE= http://portland.freedesktop.org/ COMMENT= Tools to assist applications with various desktop integration tasks LICENSE= mit +BUILD_DEPENDS+= xmlto-[0-9]*:../../textproc/xmlto +BUILD_DEPENDS+= w3m-[0-9]*:../../www/w3m + GNU_CONFIGURE= yes USE_LANGUAGES= # none -USE_TOOLS+= bash:run gsed:run +USE_TOOLS+= bash:run gmake gsed:run SUBST_CLASSES+= gsed SUBST_FILES.gsed= scripts/xdg-* @@ -22,13 +24,6 @@ SUBST_MESSAGE.gsed= Use GNU sed instead of sed. SUBST_SED.gsed+= -e "s/sed /gsed /g" # "foo > /dev/null 2> /dev/null" gives "foo: not found" with NetBSD's sh -REPLACE_BASH+= scripts/xdg-desktop-icon -REPLACE_BASH+= scripts/xdg-desktop-menu -REPLACE_BASH+= scripts/xdg-email -REPLACE_BASH+= scripts/xdg-icon-resource -REPLACE_BASH+= scripts/xdg-mime -REPLACE_BASH+= scripts/xdg-open -REPLACE_BASH+= scripts/xdg-screensaver -REPLACE_BASH+= scripts/xdg-settings +REPLACE_BASH+= scripts/xdg-* .include "../../mk/bsd.pkg.mk" diff --git a/misc/xdg-utils/distinfo b/misc/xdg-utils/distinfo index 287f3512ef9..4e7c3fb1b35 100644 --- a/misc/xdg-utils/distinfo +++ b/misc/xdg-utils/distinfo @@ -1,13 +1,6 @@ -$NetBSD: distinfo,v 1.4 2013/03/17 19:56:43 markd Exp $ +$NetBSD: distinfo,v 1.5 2015/10/15 10:53:35 wiz Exp $ -SHA1 (xdg-utils-1.1.0-rc1.tar.gz) = 5bd5e2fe10e3055ccec347e8608476fab2d3eaca -RMD160 (xdg-utils-1.1.0-rc1.tar.gz) = a3cbf8b6a71225933188efbd386f534b12c004e9 -Size (xdg-utils-1.1.0-rc1.tar.gz) = 300546 bytes -SHA1 (patch-scripts_xdg-desktop-icon) = 306fadef265e310c8ce105bd92fe75ffbc69a74a -SHA1 (patch-scripts_xdg-desktop-menu) = 28f4d6d872d9667cc891776b53d7409a0ab40ccb -SHA1 (patch-scripts_xdg-email) = 3f233616c1dd81749bbab19d62c87c58db91a2fb -SHA1 (patch-scripts_xdg-icon-resource) = 7ed65c902aa00823162f71c468b3c6bf499ac86c -SHA1 (patch-scripts_xdg-mime) = 09b6040ca1fc448bdba3678c7d8c4b269073e115 -SHA1 (patch-scripts_xdg-open) = a6c1db8eff7b64b8b43676f2801bc93081abe7ff -SHA1 (patch-scripts_xdg-screensaver) = e6efae6e52ea300d68d0486a651bed7a904c9694 -SHA1 (patch-scripts_xdg-settings) = fe8a89b2e5cb7b37f0b139305fda0eaebeede02f +SHA1 (xdg-utils-1.1.1.tar.gz) = 0f046491a4f43475f6371f3fb345cb26cedb5114 +RMD160 (xdg-utils-1.1.1.tar.gz) = f00ee2112a86393420d1c233e0ad98d9bfd994bf +SHA512 (xdg-utils-1.1.1.tar.gz) = 6641b17daea7eecfee0d395e621dc42481582e505bff90a6df5eb0299ed2dca7a76520f000d9545a8424f06d41590382156a2e50f3d68d5c1ab825c268e90edb +Size (xdg-utils-1.1.1.tar.gz) = 295213 bytes diff --git a/misc/xdg-utils/patches/patch-scripts_xdg-desktop-icon b/misc/xdg-utils/patches/patch-scripts_xdg-desktop-icon deleted file mode 100644 index 18c1e1b4f3f..00000000000 --- a/misc/xdg-utils/patches/patch-scripts_xdg-desktop-icon +++ /dev/null @@ -1,13 +0,0 @@ -$NetBSD: patch-scripts_xdg-desktop-icon,v 1.1 2013/03/17 19:56:43 markd Exp $ - ---- scripts/xdg-desktop-icon.orig 2011-01-01 10:03:14.000000000 +0000 -+++ scripts/xdg-desktop-icon -@@ -408,7 +408,7 @@ detectDE() - elif [ x"$GNOME_DESKTOP_SESSION_ID" != x"" ]; then DE=gnome; - elif `dbus-send --print-reply --dest=org.freedesktop.DBus /org/freedesktop/DBus org.freedesktop.DBus.GetNameOwner string:org.gnome.SessionManager > /dev/null 2>&1` ; then DE=gnome; - elif xprop -root _DT_SAVE_MODE 2> /dev/null | grep ' = \"xfce4\"$' >/dev/null 2>&1; then DE=xfce; -- elif [ x"$DESKTOP_SESSION" == x"LXDE" ]; then DE=lxde; -+ elif [ x"$DESKTOP_SESSION" = x"LXDE" ]; then DE=lxde; - else DE="" - fi - } diff --git a/misc/xdg-utils/patches/patch-scripts_xdg-desktop-menu b/misc/xdg-utils/patches/patch-scripts_xdg-desktop-menu deleted file mode 100644 index 9854c375c50..00000000000 --- a/misc/xdg-utils/patches/patch-scripts_xdg-desktop-menu +++ /dev/null @@ -1,13 +0,0 @@ -$NetBSD: patch-scripts_xdg-desktop-menu,v 1.1 2013/03/17 19:56:43 markd Exp $ - ---- scripts/xdg-desktop-menu.orig 2011-01-01 10:03:14.000000000 +0000 -+++ scripts/xdg-desktop-menu -@@ -604,7 +604,7 @@ detectDE() - elif [ x"$GNOME_DESKTOP_SESSION_ID" != x"" ]; then DE=gnome; - elif `dbus-send --print-reply --dest=org.freedesktop.DBus /org/freedesktop/DBus org.freedesktop.DBus.GetNameOwner string:org.gnome.SessionManager > /dev/null 2>&1` ; then DE=gnome; - elif xprop -root _DT_SAVE_MODE 2> /dev/null | grep ' = \"xfce4\"$' >/dev/null 2>&1; then DE=xfce; -- elif [ x"$DESKTOP_SESSION" == x"LXDE" ]; then DE=lxde; -+ elif [ x"$DESKTOP_SESSION" = x"LXDE" ]; then DE=lxde; - else DE="" - fi - } diff --git a/misc/xdg-utils/patches/patch-scripts_xdg-email b/misc/xdg-utils/patches/patch-scripts_xdg-email deleted file mode 100644 index 8620aca7fde..00000000000 --- a/misc/xdg-utils/patches/patch-scripts_xdg-email +++ /dev/null @@ -1,13 +0,0 @@ -$NetBSD: patch-scripts_xdg-email,v 1.1 2013/03/17 19:56:43 markd Exp $ - ---- scripts/xdg-email.orig 2011-01-01 10:03:14.000000000 +0000 -+++ scripts/xdg-email -@@ -360,7 +360,7 @@ detectDE() - elif [ x"$GNOME_DESKTOP_SESSION_ID" != x"" ]; then DE=gnome; - elif `dbus-send --print-reply --dest=org.freedesktop.DBus /org/freedesktop/DBus org.freedesktop.DBus.GetNameOwner string:org.gnome.SessionManager > /dev/null 2>&1` ; then DE=gnome; - elif xprop -root _DT_SAVE_MODE 2> /dev/null | grep ' = \"xfce4\"$' >/dev/null 2>&1; then DE=xfce; -- elif [ x"$DESKTOP_SESSION" == x"LXDE" ]; then DE=lxde; -+ elif [ x"$DESKTOP_SESSION" = x"LXDE" ]; then DE=lxde; - else DE="" - fi - } diff --git a/misc/xdg-utils/patches/patch-scripts_xdg-icon-resource b/misc/xdg-utils/patches/patch-scripts_xdg-icon-resource deleted file mode 100644 index a8cfba567a6..00000000000 --- a/misc/xdg-utils/patches/patch-scripts_xdg-icon-resource +++ /dev/null @@ -1,13 +0,0 @@ -$NetBSD: patch-scripts_xdg-icon-resource,v 1.1 2013/03/17 19:56:43 markd Exp $ - ---- scripts/xdg-icon-resource.orig 2011-01-01 10:03:14.000000000 +0000 -+++ scripts/xdg-icon-resource -@@ -400,7 +400,7 @@ detectDE() - elif [ x"$GNOME_DESKTOP_SESSION_ID" != x"" ]; then DE=gnome; - elif `dbus-send --print-reply --dest=org.freedesktop.DBus /org/freedesktop/DBus org.freedesktop.DBus.GetNameOwner string:org.gnome.SessionManager > /dev/null 2>&1` ; then DE=gnome; - elif xprop -root _DT_SAVE_MODE 2> /dev/null | grep ' = \"xfce4\"$' >/dev/null 2>&1; then DE=xfce; -- elif [ x"$DESKTOP_SESSION" == x"LXDE" ]; then DE=lxde; -+ elif [ x"$DESKTOP_SESSION" = x"LXDE" ]; then DE=lxde; - else DE="" - fi - } diff --git a/misc/xdg-utils/patches/patch-scripts_xdg-mime b/misc/xdg-utils/patches/patch-scripts_xdg-mime deleted file mode 100644 index a3453521398..00000000000 --- a/misc/xdg-utils/patches/patch-scripts_xdg-mime +++ /dev/null @@ -1,13 +0,0 @@ -$NetBSD: patch-scripts_xdg-mime,v 1.1 2013/03/17 19:56:43 markd Exp $ - ---- scripts/xdg-mime.orig 2011-01-01 10:03:14.000000000 +0000 -+++ scripts/xdg-mime -@@ -430,7 +430,7 @@ detectDE() - elif [ x"$GNOME_DESKTOP_SESSION_ID" != x"" ]; then DE=gnome; - elif `dbus-send --print-reply --dest=org.freedesktop.DBus /org/freedesktop/DBus org.freedesktop.DBus.GetNameOwner string:org.gnome.SessionManager > /dev/null 2>&1` ; then DE=gnome; - elif xprop -root _DT_SAVE_MODE 2> /dev/null | grep ' = \"xfce4\"$' >/dev/null 2>&1; then DE=xfce; -- elif [ x"$DESKTOP_SESSION" == x"LXDE" ]; then DE=lxde; -+ elif [ x"$DESKTOP_SESSION" = x"LXDE" ]; then DE=lxde; - else DE="" - fi - } diff --git a/misc/xdg-utils/patches/patch-scripts_xdg-open b/misc/xdg-utils/patches/patch-scripts_xdg-open deleted file mode 100644 index 258b245c1fe..00000000000 --- a/misc/xdg-utils/patches/patch-scripts_xdg-open +++ /dev/null @@ -1,13 +0,0 @@ -$NetBSD: patch-scripts_xdg-open,v 1.1 2013/03/17 19:56:43 markd Exp $ - ---- scripts/xdg-open.orig 2011-01-01 10:03:14.000000000 +0000 -+++ scripts/xdg-open -@@ -307,7 +307,7 @@ detectDE() - elif [ x"$GNOME_DESKTOP_SESSION_ID" != x"" ]; then DE=gnome; - elif `dbus-send --print-reply --dest=org.freedesktop.DBus /org/freedesktop/DBus org.freedesktop.DBus.GetNameOwner string:org.gnome.SessionManager > /dev/null 2>&1` ; then DE=gnome; - elif xprop -root _DT_SAVE_MODE 2> /dev/null | grep ' = \"xfce4\"$' >/dev/null 2>&1; then DE=xfce; -- elif [ x"$DESKTOP_SESSION" == x"LXDE" ]; then DE=lxde; -+ elif [ x"$DESKTOP_SESSION" = x"LXDE" ]; then DE=lxde; - else DE="" - fi - } diff --git a/misc/xdg-utils/patches/patch-scripts_xdg-screensaver b/misc/xdg-utils/patches/patch-scripts_xdg-screensaver deleted file mode 100644 index 51afb3cd9d7..00000000000 --- a/misc/xdg-utils/patches/patch-scripts_xdg-screensaver +++ /dev/null @@ -1,13 +0,0 @@ -$NetBSD: patch-scripts_xdg-screensaver,v 1.1 2013/03/17 19:56:43 markd Exp $ - ---- scripts/xdg-screensaver.orig 2011-01-01 10:03:14.000000000 +0000 -+++ scripts/xdg-screensaver -@@ -335,7 +335,7 @@ detectDE() - elif [ x"$GNOME_DESKTOP_SESSION_ID" != x"" ]; then DE=gnome; - elif `dbus-send --print-reply --dest=org.freedesktop.DBus /org/freedesktop/DBus org.freedesktop.DBus.GetNameOwner string:org.gnome.SessionManager > /dev/null 2>&1` ; then DE=gnome; - elif xprop -root _DT_SAVE_MODE 2> /dev/null | grep ' = \"xfce4\"$' >/dev/null 2>&1; then DE=xfce; -- elif [ x"$DESKTOP_SESSION" == x"LXDE" ]; then DE=lxde; -+ elif [ x"$DESKTOP_SESSION" = x"LXDE" ]; then DE=lxde; - else DE="" - fi - } diff --git a/misc/xdg-utils/patches/patch-scripts_xdg-settings b/misc/xdg-utils/patches/patch-scripts_xdg-settings deleted file mode 100644 index b3b7f69e407..00000000000 --- a/misc/xdg-utils/patches/patch-scripts_xdg-settings +++ /dev/null @@ -1,13 +0,0 @@ -$NetBSD: patch-scripts_xdg-settings,v 1.1 2013/03/17 19:56:43 markd Exp $ - ---- scripts/xdg-settings.orig 2011-01-01 10:03:14.000000000 +0000 -+++ scripts/xdg-settings -@@ -315,7 +315,7 @@ detectDE() - elif [ x"$GNOME_DESKTOP_SESSION_ID" != x"" ]; then DE=gnome; - elif `dbus-send --print-reply --dest=org.freedesktop.DBus /org/freedesktop/DBus org.freedesktop.DBus.GetNameOwner string:org.gnome.SessionManager > /dev/null 2>&1` ; then DE=gnome; - elif xprop -root _DT_SAVE_MODE 2> /dev/null | grep ' = \"xfce4\"$' >/dev/null 2>&1; then DE=xfce; -- elif [ x"$DESKTOP_SESSION" == x"LXDE" ]; then DE=lxde; -+ elif [ x"$DESKTOP_SESSION" = x"LXDE" ]; then DE=lxde; - else DE="" - fi - } |