Update to xdg-utils-1.1.0rc2 + fixes from upstream.
Committing now since these utilities tend to break after an update in very subtle ways...
This commit is contained in:
ajacoutot
parent
23407304b8
commit
606cb16110
@ -1,4 +1,4 @@
|
||||
# $OpenBSD: Makefile,v 1.24 2014/06/02 09:25:33 stsp Exp $
|
||||
# $OpenBSD: Makefile,v 1.25 2014/08/28 10:26:20 ajacoutot Exp $
|
||||
|
||||
# Does _not_ depend on desktop-file-utils, hicolor-icon-theme,
|
||||
# gtk-update-icon-cache, shared-mime-info... on purpose as it should
|
||||
@ -6,34 +6,50 @@
|
||||
|
||||
COMMENT= utilities to assist desktop integration tasks
|
||||
|
||||
DISTNAME= xdg-utils-1.1.0-rc1
|
||||
PKGNAME= xdg-utils-1.1.0rc1
|
||||
REVISION= 4
|
||||
DISTNAME= xdg-utils-1.1.0-rc2
|
||||
PKGNAME= xdg-utils-1.1.0rc2
|
||||
|
||||
DIST_SUBDIR= xdg-utils
|
||||
MASTER_SITES0= http://cgit.freedesktop.org/xdg/xdg-utils/patch/?id=
|
||||
PATCH_DIST_STRIP=-p1
|
||||
IDS= a983a14293129ea94b634579a46dc69835e88e15 \
|
||||
cba39e7a00abe27b3bff49e2d455bb30ad33dde6 \
|
||||
495fa68306f6f5b0c0bb312e92f0f2a0e35fa567 \
|
||||
50254545a0d2c181bf9bce4c7723044ee7186cb5 \
|
||||
3eaf93ab3303e14813885b6b743b48a1c3b5a6ab \
|
||||
316b9adc05c6d871360afb1195939c5fc975ccff \
|
||||
ba265f969b9061d221915c2528122c44a85ad7c2 \
|
||||
69adcfeb4679f75eb24f357f304715d3c014273b \
|
||||
5913207e625a92b73cd9489aea4b7b10bf3eb855 \
|
||||
34e033845ea6997bc4fdafd9bdd4856bfa5d0d36 \
|
||||
7cd846d62e17f36be2f7d29e56188ddf6a6d72cb
|
||||
.for i in ${IDS}
|
||||
PATCHFILES += $i:0
|
||||
.endfor
|
||||
BUILD_DEPENDS += textproc/xmlto
|
||||
|
||||
CATEGORIES= devel
|
||||
|
||||
HOMEPAGE= http://portland.freedesktop.org/wiki/
|
||||
HOMEPAGE= http://portland.freedesktop.org/
|
||||
|
||||
MAINTAINER= Antoine Jacoutot <ajacoutot@openbsd.org>
|
||||
|
||||
# MIT
|
||||
PERMIT_PACKAGE_CDROM= Yes
|
||||
|
||||
MASTER_SITES= http://portland.freedesktop.org/download/
|
||||
MASTER_SITES= http://people.freedesktop.org/~rdieter/xdg-utils/
|
||||
|
||||
NO_BUILD= Yes
|
||||
PKG_ARCH= *
|
||||
USE_GMAKE= Yes
|
||||
NO_TEST= Yes
|
||||
|
||||
CONFIGURE_STYLE=gnu
|
||||
CONFIGURE_ENV= ac_cv_path_XMLTO=""
|
||||
#CONFIGURE_ENV= ac_cv_path_XMLTO=""
|
||||
|
||||
pre-configure:
|
||||
${SUBST_CMD} \
|
||||
${WRKSRC}/scripts/xdg-desktop-menu \
|
||||
${WRKSRC}/scripts/xdg-icon-resource \
|
||||
${WRKSRC}/scripts/xdg-mime \
|
||||
${WRKSRC}/scripts/xdg-open \
|
||||
${WRKSRC}/scripts/xdg-settings
|
||||
perl -pi -e 's,/usr/local/share,${LOCALBASE}/share,g;' \
|
||||
-e 's,/etc/xdg,${SYSCONFDIR}/xdg,g' \
|
||||
${WRKSRC}/scripts/xdg-*.in
|
||||
|
||||
post-install:
|
||||
# Official NetBeans does not know about OpenBSD, thus at least
|
||||
|
||||
@ -1,5 +1,24 @@
|
||||
MD5 (xdg-utils-1.1.0-rc1.tar.gz) = +t9eegjgUm/GDb4+W3741g==
|
||||
RMD160 (xdg-utils-1.1.0-rc1.tar.gz) = o8v4tqcSJZMxiO+9OG9TSxLABOk=
|
||||
SHA1 (xdg-utils-1.1.0-rc1.tar.gz) = W9Xi/hDjBVzOw0foYIR2+rLT6so=
|
||||
SHA256 (xdg-utils-1.1.0-rc1.tar.gz) = ewVViuS7jt41aGPK6MQuPgEqpCG/nUUTClcP0gnXkQI=
|
||||
SIZE (xdg-utils-1.1.0-rc1.tar.gz) = 300546
|
||||
SHA256 (xdg-utils/316b9adc05c6d871360afb1195939c5fc975ccff) = x4/s/g9/wyoRpt9cOpm9KdywBjf0E5ARHVJ6+zu3y/0=
|
||||
SHA256 (xdg-utils/34e033845ea6997bc4fdafd9bdd4856bfa5d0d36) = anUPZopg0tQtWpsG1b4ZO/9xfkJQ1wMOPJYFbuFPnjw=
|
||||
SHA256 (xdg-utils/3eaf93ab3303e14813885b6b743b48a1c3b5a6ab) = dSvhmTqff+qYTKvGbIdTOrA/pzFKuN9MDgD70hGc/Vw=
|
||||
SHA256 (xdg-utils/495fa68306f6f5b0c0bb312e92f0f2a0e35fa567) = WkZ6j9Zsn5crBzt48K52KWsS9BwbkJThoc0McmnDLNQ=
|
||||
SHA256 (xdg-utils/50254545a0d2c181bf9bce4c7723044ee7186cb5) = tRKLja4F40Tryhj+qaDnl+NzeNCRSHwcH4J0Y0FJ8EA=
|
||||
SHA256 (xdg-utils/5913207e625a92b73cd9489aea4b7b10bf3eb855) = cniYlnyYGSFT4l1TdBfdwHXkrIdr+v41BX2RZhm5ejY=
|
||||
SHA256 (xdg-utils/69adcfeb4679f75eb24f357f304715d3c014273b) = SbRz/wPFvtjMspp20Q5sd1JO5EiMnpqmNf47BT+acEY=
|
||||
SHA256 (xdg-utils/7cd846d62e17f36be2f7d29e56188ddf6a6d72cb) = cdx2gbpLVaQ4HcKz21nQ+jqxdhiHCqtcPfuS6ZxLUP0=
|
||||
SHA256 (xdg-utils/a983a14293129ea94b634579a46dc69835e88e15) = +0d55sDsVb3dVr1CVv6qvdAiUlwkEBAueVIR4AMI+3w=
|
||||
SHA256 (xdg-utils/ba265f969b9061d221915c2528122c44a85ad7c2) = HcDwsPo+79hK4m16XgMV8nnIqKqxiyU7U3N5VZIIo6o=
|
||||
SHA256 (xdg-utils/cba39e7a00abe27b3bff49e2d455bb30ad33dde6) = 9nkDy3ceM5jPQEbzzbw6OsmsERjYk0enoxrFK/0LNJ4=
|
||||
SHA256 (xdg-utils/xdg-utils-1.1.0-rc2.tar.gz) = u+lexOfVSCeYFZhiLa/aj9IMoqL93IqUDddBIVuv8ew=
|
||||
SIZE (xdg-utils/316b9adc05c6d871360afb1195939c5fc975ccff) = 1988
|
||||
SIZE (xdg-utils/34e033845ea6997bc4fdafd9bdd4856bfa5d0d36) = 837
|
||||
SIZE (xdg-utils/3eaf93ab3303e14813885b6b743b48a1c3b5a6ab) = 558
|
||||
SIZE (xdg-utils/495fa68306f6f5b0c0bb312e92f0f2a0e35fa567) = 2044
|
||||
SIZE (xdg-utils/50254545a0d2c181bf9bce4c7723044ee7186cb5) = 1883
|
||||
SIZE (xdg-utils/5913207e625a92b73cd9489aea4b7b10bf3eb855) = 1125
|
||||
SIZE (xdg-utils/69adcfeb4679f75eb24f357f304715d3c014273b) = 703
|
||||
SIZE (xdg-utils/7cd846d62e17f36be2f7d29e56188ddf6a6d72cb) = 1101
|
||||
SIZE (xdg-utils/a983a14293129ea94b634579a46dc69835e88e15) = 722
|
||||
SIZE (xdg-utils/ba265f969b9061d221915c2528122c44a85ad7c2) = 1492
|
||||
SIZE (xdg-utils/cba39e7a00abe27b3bff49e2d455bb30ad33dde6) = 1308
|
||||
SIZE (xdg-utils/xdg-utils-1.1.0-rc2.tar.gz) = 307013
|
||||
|
||||
@ -1,75 +0,0 @@
|
||||
$OpenBSD: patch-scripts_xdg-desktop-menu,v 1.2 2012/04/09 09:39:15 ajacoutot Exp $
|
||||
--- scripts/xdg-desktop-menu.orig Sat Jan 1 11:03:14 2011
|
||||
+++ scripts/xdg-desktop-menu Mon Apr 9 10:46:52 2012
|
||||
@@ -665,7 +665,7 @@ make_lazy_default()
|
||||
|
||||
for MIME in $mimetypes ; do
|
||||
xdg_default_dirs="$XDG_DATA_DIRS"
|
||||
- [ -n "$xdg_default_dirs" ] || xdg_default_dirs=/usr/local/share/:/usr/share/
|
||||
+ [ -n "$xdg_default_dirs" ] || xdg_default_dirs=${LOCALBASE}/share/:/usr/share/
|
||||
if [ x"$mode" = x"user" ] ; then
|
||||
xdg_user_dir="$XDG_DATA_HOME"
|
||||
[ -n "$xdg_user_dir" ] || xdg_user_dir="$HOME/.local/share"
|
||||
@@ -708,7 +708,7 @@ update_submenu()
|
||||
xdg_user_dir="$xdg_user_dir/$xdg_dir_name"
|
||||
|
||||
xdg_system_dirs="$XDG_CONFIG_DIRS"
|
||||
- [ -n "$xdg_system_dirs" ] || xdg_system_dirs=/etc/xdg
|
||||
+ [ -n "$xdg_system_dirs" ] || xdg_system_dirs=${SYSCONFDIR}/xdg
|
||||
xdg_global_dir=
|
||||
for x in `echo $xdg_system_dirs | sed 's/:/ /g'` ; do
|
||||
if [ -w $x/$xdg_dir_name ] ; then
|
||||
@@ -756,7 +756,7 @@ update_submenu()
|
||||
return
|
||||
fi
|
||||
|
||||
- if [ $action = "install" -a -f "/etc/xdg/menus/gnome-applications.menu" ] ; then
|
||||
+ if [ $action = "install" -a -f "${SYSCONFDIR}/xdg/menus/gnome-applications.menu" ] ; then
|
||||
# Work around for Debian Gnome
|
||||
gnome_xdg_dir=`echo "$xdg_dir" | sed -e 's^/applications-merged^/gnome-applications-merged^'`
|
||||
if [ ! -e "$gnome_xdg_dir" ] ; then
|
||||
@@ -774,7 +774,7 @@ update_submenu()
|
||||
eval 'ln -s "applications-merged" "$mandrake_xdg_dir"'$xdg_redirect_output
|
||||
fi
|
||||
fi
|
||||
- if [ $action = "install" -a x"$mode" = x"user" -a -d "/etc/xdg/menus/kde-applications-merged" ] ; then
|
||||
+ if [ $action = "install" -a x"$mode" = x"user" -a -d "${SYSCONFDIR}/xdg/menus/kde-applications-merged" ] ; then
|
||||
# Work around for Fedora Core 5 + patched KDE
|
||||
kde_xdg_dir=`echo "$xdg_dir" | sed -e 's^/applications-merged^/kde-applications-merged^'`
|
||||
if [ ! -e "$kde_xdg_dir" ] ; then
|
||||
@@ -783,7 +783,7 @@ update_submenu()
|
||||
eval 'ln -s "applications-merged" "$kde_xdg_dir"'$xdg_redirect_output
|
||||
fi
|
||||
fi
|
||||
- if [ $action = "install" -a x"$mode" = x"system" -a -d "/etc/xdg/menus/kde-applications-merged" -a ! -d "/etc/xdg/menus/applications-merged" ] ; then
|
||||
+ if [ $action = "install" -a x"$mode" = x"system" -a -d "${SYSCONFDIR}/xdg/menus/kde-applications-merged" -a ! -d "${SYSCONFDIR}/xdg/menus/applications-merged" ] ; then
|
||||
# Work around for Kubuntu 6.06
|
||||
kde_xdg_dir=`echo "$xdg_dir" | sed -e 's^/applications-merged^/kde-applications-merged^'`
|
||||
DEBUG 1 "Kubuntu Workaround: Link '$xdg_dir' to 'kde-applications-merged'"
|
||||
@@ -1071,7 +1071,7 @@ xdg_user_dir="$XDG_DATA_HOME"
|
||||
xdg_user_dir="$xdg_user_dir/$xdg_dir_name"
|
||||
|
||||
xdg_system_dirs="$XDG_DATA_DIRS"
|
||||
-[ -n "$xdg_system_dirs" ] || xdg_system_dirs=/usr/local/share/:/usr/share/
|
||||
+[ -n "$xdg_system_dirs" ] || xdg_system_dirs=${LOCALBASE}/share/:/usr/share/
|
||||
xdg_global_dir=
|
||||
for x in `echo $xdg_system_dirs | sed 's/:/ /g'` ; do
|
||||
if [ -w $x/$xdg_dir_name ] ; then
|
||||
@@ -1138,7 +1138,7 @@ xdg_user_dir="$XDG_DATA_HOME"
|
||||
xdg_user_dir="$xdg_user_dir/$xdg_dir_name"
|
||||
|
||||
xdg_system_dirs="$XDG_DATA_DIRS"
|
||||
-[ -n "$xdg_system_dirs" ] || xdg_system_dirs=/usr/local/share/:/usr/share/
|
||||
+[ -n "$xdg_system_dirs" ] || xdg_system_dirs=${LOCALBASE}/share/:/usr/share/
|
||||
xdg_global_dir=
|
||||
for x in `echo $xdg_system_dirs | sed 's/:/ /g'` ; do
|
||||
if [ -w $x/$xdg_dir_name ] ; then
|
||||
@@ -1152,7 +1152,7 @@ kde_global_dir=`kde${KDE_SESSION_VERSION}-config --pat
|
||||
[ -w $kde_global_dir ] || kde_global_dir=
|
||||
|
||||
gnome_user_dir="$HOME/.gnome/apps"
|
||||
-gnome_global_dir="/usr/share/gnome/apps"
|
||||
+gnome_global_dir="${LOCALBASE}/share/gnome/apps"
|
||||
[ -w $gnome_global_dir ] || gnome_global_dir=
|
||||
|
||||
DEBUG 3 "Install locations for *.desktop files:"
|
||||
@ -1,21 +0,0 @@
|
||||
$OpenBSD: patch-scripts_xdg-email,v 1.5 2012/04/09 09:39:15 ajacoutot Exp $
|
||||
--- scripts/xdg-email.orig Sat Jan 1 11:03:14 2011
|
||||
+++ scripts/xdg-email Mon Apr 9 10:57:05 2012
|
||||
@@ -562,7 +562,7 @@ result=$(echo "$1" | $utf8 | awk '
|
||||
|
||||
options=
|
||||
mailto=
|
||||
-utf8="iconv -t utf8"
|
||||
+utf8="iconv -t UTF-8"
|
||||
while [ $# -gt 0 ] ; do
|
||||
parm="$1"
|
||||
shift
|
||||
@@ -699,7 +699,7 @@ fi
|
||||
if [ x"$BROWSER" = x"" ]; then
|
||||
BROWSER=links2:links:lynx:w3m
|
||||
if [ -n "$DISPLAY" ]; then
|
||||
- BROWSER=firefox:mozilla:epiphany:konqueror:chromium-browser:google-chrome:$BROWSER
|
||||
+ BROWSER=firefox:chrome:seamonkey:mozilla:epiphany:midori:konqueror:opera:firefox35:firefox36:$BROWSER
|
||||
fi
|
||||
fi
|
||||
|
||||
21
devel/xdg-utils/patches/patch-scripts_xdg-email_in
Normal file
21
devel/xdg-utils/patches/patch-scripts_xdg-email_in
Normal file
@ -0,0 +1,21 @@
|
||||
$OpenBSD: patch-scripts_xdg-email_in,v 1.1 2014/08/28 10:26:21 ajacoutot Exp $
|
||||
--- scripts/xdg-email.in.orig Thu Aug 28 11:44:28 2014
|
||||
+++ scripts/xdg-email.in Thu Aug 28 11:45:23 2014
|
||||
@@ -243,7 +243,7 @@ LC_ALL="$ORIG_LC_ALL"
|
||||
|
||||
options=
|
||||
mailto=
|
||||
-utf8="iconv -t utf8"
|
||||
+utf8="iconv -t UTF-8"
|
||||
while [ $# -gt 0 ] ; do
|
||||
parm="$1"
|
||||
shift
|
||||
@@ -380,7 +380,7 @@ fi
|
||||
if [ x"$BROWSER" = x"" ]; then
|
||||
BROWSER=links2:elinks:links:lynx:w3m
|
||||
if [ -n "$DISPLAY" ]; then
|
||||
- BROWSER=x-www-browser:firefox:seamonkey:mozilla:epiphany:konqueror:chromium-browser:google-chrome:$BROWSER
|
||||
+ BROWSER=x-www-browser:firefox:chrome:seamonkey:mozilla:epiphany:midori:konqueror:opera:chromium-browser:google-chrome:$BROWSER
|
||||
fi
|
||||
fi
|
||||
|
||||
@ -1,12 +0,0 @@
|
||||
$OpenBSD: patch-scripts_xdg-icon-resource,v 1.2 2012/04/09 09:39:15 ajacoutot Exp $
|
||||
--- scripts/xdg-icon-resource.orig Sat Jan 1 11:03:14 2011
|
||||
+++ scripts/xdg-icon-resource Mon Apr 9 10:42:20 2012
|
||||
@@ -615,7 +615,7 @@ xdg_user_dir="$xdg_user_dir/$xdg_dir_name"
|
||||
xdg_global_dir=
|
||||
xdg_global_prefix=
|
||||
xdg_system_dirs="$XDG_DATA_DIRS"
|
||||
-[ -n "$xdg_system_dirs" ] || xdg_system_dirs="/usr/local/share/:/usr/share/"
|
||||
+[ -n "$xdg_system_dirs" ] || xdg_system_dirs="${LOCALBASE}/share/:/usr/share/"
|
||||
for x in `echo "$xdg_system_dirs" | sed 's/:/ /g'`; do
|
||||
if [ -w $x/$xdg_dir_name ] ; then
|
||||
xdg_global_prefix="$x/icons"
|
||||
@ -1,37 +0,0 @@
|
||||
$OpenBSD: patch-scripts_xdg-mime,v 1.7 2012/04/09 09:39:15 ajacoutot Exp $
|
||||
--- scripts/xdg-mime.orig Sat Jan 1 11:03:14 2011
|
||||
+++ scripts/xdg-mime Mon Apr 9 10:42:20 2012
|
||||
@@ -676,11 +676,14 @@ defapp_generic()
|
||||
[ -n "$xdg_user_dir" ] || xdg_user_dir="$HOME/.local/share"
|
||||
xdg_user_dir="$xdg_user_dir/$xdg_dir_name"
|
||||
xdg_system_dirs="$XDG_DATA_DIRS"
|
||||
- [ -n "$xdg_system_dirs" ] || xdg_system_dirs=/usr/local/share/:/usr/share/
|
||||
+ [ -n "$xdg_system_dirs" ] || xdg_system_dirs=${LOCALBASE}/share/:/usr/share/
|
||||
|
||||
for x in `echo "$xdg_user_dir:$xdg_system_dirs" | sed 's/:/ /g'`; do
|
||||
DEBUG 2 "Checking $x/applications/defaults.list"
|
||||
trader_result=`grep "$MIME=" $x/applications/defaults.list 2> /dev/null | cut -d '=' -f 2 | cut -d ';' -f 1`
|
||||
+ if [ -z "$trader_result" ] ; then
|
||||
+ trader_result=`grep "$MIME=" $x/applications/mimeinfo.cache 2> /dev/null | cut -d '=' -f 2 | cut -d ';' -f 1`
|
||||
+ fi
|
||||
if [ -n "$trader_result" ] ; then
|
||||
echo $trader_result
|
||||
exit_success
|
||||
@@ -952,7 +955,7 @@ xdg_user_dir="$XDG_DATA_HOME"
|
||||
xdg_user_dir="$xdg_user_dir/$xdg_dir_name"
|
||||
|
||||
xdg_system_dirs="$XDG_DATA_DIRS"
|
||||
-[ -n "$xdg_system_dirs" ] || xdg_system_dirs=/usr/local/share/:/usr/share/
|
||||
+[ -n "$xdg_system_dirs" ] || xdg_system_dirs=${LOCALBASE}/share/:/usr/share/
|
||||
for x in `echo $xdg_system_dirs | sed 's/:/ /g'`; do
|
||||
if [ -w $x/$xdg_dir_name ] ; then
|
||||
[ x"$mode" = x"system" ] && xdg_base_dir="$x/mime"
|
||||
@@ -984,7 +987,7 @@ DEBUG 3 "kde_global_dir: $kde_global_dir"
|
||||
# TODO: Gnome legacy support
|
||||
# See http://forums.fedoraforum.org/showthread.php?t=26875
|
||||
gnome_user_dir="$HOME/.gnome/apps"
|
||||
-gnome_global_dir=/usr/share/gnome/apps
|
||||
+gnome_global_dir=${LOCALBASE}/share/gnome/apps
|
||||
[ -w $gnome_global_dir ] || gnome_global_dir=
|
||||
DEBUG 3 "gnome_user_dir: $gnome_user_dir"
|
||||
DEBUG 3 "gnome_global_dir: $gnome_global_dir"
|
||||
13
devel/xdg-utils/patches/patch-scripts_xdg-mime_in
Normal file
13
devel/xdg-utils/patches/patch-scripts_xdg-mime_in
Normal file
@ -0,0 +1,13 @@
|
||||
$OpenBSD: patch-scripts_xdg-mime_in,v 1.1 2014/08/28 10:26:21 ajacoutot Exp $
|
||||
--- scripts/xdg-mime.in.orig Thu Aug 28 11:47:45 2014
|
||||
+++ scripts/xdg-mime.in Thu Aug 28 11:48:30 2014
|
||||
@@ -380,6 +380,9 @@ defapp_generic()
|
||||
for prefix in "$XDG_MENU_PREFIX" ""; do
|
||||
DEBUG 2 "Checking $x/applications/${prefix}defaults.list and $x/applications/${prefix}mimeinfo.cache"
|
||||
trader_result=`grep "$MIME=" $x/applications/${prefix}defaults.list $x/applications/${prefix}mimeinfo.cache 2> /dev/null | cut -d '=' -f 2 | cut -d ';' -f 1`
|
||||
+ if [ -z "$trader_result" ] ; then
|
||||
+ trader_result=`grep "$MIME=" $x/applications/mimeinfo.cache 2> /dev/null | cut -d '=' -f 2 | cut -d ';' -f 1`
|
||||
+ fi
|
||||
if [ -n "$trader_result" ] ; then
|
||||
echo $trader_result
|
||||
exit_success
|
||||
@ -1,41 +0,0 @@
|
||||
$OpenBSD: patch-scripts_xdg-open,v 1.9 2014/06/02 09:25:33 stsp Exp $
|
||||
|
||||
Make xdg-open work with toad(8) under KDE4.
|
||||
Fix sed(1) usage (i.e. !GNU sed).
|
||||
|
||||
--- scripts/xdg-open.orig Sat Jan 1 11:03:14 2011
|
||||
+++ scripts/xdg-open Sat May 31 19:33:38 2014
|
||||
@@ -304,6 +304,7 @@ fi
|
||||
detectDE()
|
||||
{
|
||||
if [ x"$KDE_FULL_SESSION" = x"true" ]; then DE=kde;
|
||||
+ elif `dbus-send --print-reply --dest=org.freedesktop.DBus /org/freedesktop/DBus org.freedesktop.DBus.GetNameOwner string:org.kde.KWin > /dev/null 2>&1` ; then DE=kde;
|
||||
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;
|
||||
@@ -384,14 +385,14 @@ open_xfce()
|
||||
|
||||
open_generic_xdg_mime()
|
||||
{
|
||||
- filetype=`xdg-mime query filetype "$1" | sed "s/;.*//"`
|
||||
+ filetype=`xdg-mime query filetype "$1" | sed "s/[ ;].*//"`
|
||||
default=`xdg-mime query default "$filetype"`
|
||||
if [ -n "$default" ] ; then
|
||||
xdg_user_dir="$XDG_DATA_HOME"
|
||||
[ -n "$xdg_user_dir" ] || xdg_user_dir="$HOME/.local/share"
|
||||
|
||||
xdg_system_dirs="$XDG_DATA_DIRS"
|
||||
- [ -n "$xdg_system_dirs" ] || xdg_system_dirs=/usr/local/share/:/usr/share/
|
||||
+ [ -n "$xdg_system_dirs" ] || xdg_system_dirs=${LOCALBASE}/share/:/usr/share/
|
||||
|
||||
for x in `echo "$xdg_user_dir:$xdg_system_dirs" | sed 's/:/ /g'`; do
|
||||
local file="$x/applications/$default"
|
||||
@@ -526,7 +527,7 @@ fi
|
||||
if [ x"$BROWSER" = x"" ]; then
|
||||
BROWSER=links2:links:lynx:w3m
|
||||
if [ -n "$DISPLAY" ]; then
|
||||
- BROWSER=firefox:mozilla:epiphany:konqueror:chromium-browser:google-chrome:$BROWSER
|
||||
+ BROWSER=firefox:chrome:seamonkey:mozilla:epiphany:midori:konqueror:opera:firefox35:firefox36:${BROWSER}
|
||||
fi
|
||||
fi
|
||||
|
||||
24
devel/xdg-utils/patches/patch-scripts_xdg-open_in
Normal file
24
devel/xdg-utils/patches/patch-scripts_xdg-open_in
Normal file
@ -0,0 +1,24 @@
|
||||
$OpenBSD: patch-scripts_xdg-open_in,v 1.1 2014/08/28 10:26:21 ajacoutot Exp $
|
||||
|
||||
Fix sed(1) usage (i.e. !GNU sed).
|
||||
|
||||
--- scripts/xdg-open.in.orig Thu Aug 28 12:24:07 2014
|
||||
+++ scripts/xdg-open.in Thu Aug 28 12:24:24 2014
|
||||
@@ -228,7 +228,7 @@ DEBUG 3 "$xdg_user_dir:$xdg_system_dirs"
|
||||
|
||||
open_generic_xdg_file_mime()
|
||||
{
|
||||
- filetype=`xdg-mime query filetype "$1" | sed "s/;.*//"`
|
||||
+ filetype=`xdg-mime query filetype "$1" | sed "s/[ ;].*//"`
|
||||
open_generic_xdg_mime "$1" "$filetype"
|
||||
}
|
||||
|
||||
@@ -373,7 +373,7 @@ esac
|
||||
if [ x"$BROWSER" = x"" ]; then
|
||||
BROWSER=links2:elinks:links:lynx:w3m
|
||||
if [ -n "$DISPLAY" ]; then
|
||||
- BROWSER=x-www-browser:firefox:seamonkey:mozilla:epiphany:konqueror:chromium-browser:google-chrome:$BROWSER
|
||||
+ BROWSER=x-www-browser:firefox:chrome:seamonkey:mozilla:epiphany:midori:konqueror:opera:chromium-browser:google-chrome:$BROWSER
|
||||
fi
|
||||
fi
|
||||
|
||||
@ -1,12 +0,0 @@
|
||||
$OpenBSD: patch-scripts_xdg-screensaver,v 1.1 2013/01/13 19:32:12 landry Exp $
|
||||
--- scripts/xdg-screensaver.orig Sun Jan 13 19:50:00 2013
|
||||
+++ scripts/xdg-screensaver Sun Jan 13 19:56:06 2013
|
||||
@@ -358,7 +358,7 @@ kfmclient_fix_exit_code()
|
||||
}
|
||||
|
||||
# Check if we can use "mv -T"
|
||||
-if mv -T ... ... 2>&1 | grep '\.\.\.' > /dev/null ; then
|
||||
+if false ; then
|
||||
# We can securely move files in /tmp with mv -T
|
||||
DEBUG 1 "mv -T available"
|
||||
MV="mv -T"
|
||||
12
devel/xdg-utils/patches/patch-scripts_xdg-screensaver_in
Normal file
12
devel/xdg-utils/patches/patch-scripts_xdg-screensaver_in
Normal file
@ -0,0 +1,12 @@
|
||||
$OpenBSD: patch-scripts_xdg-screensaver_in,v 1.1 2014/08/28 10:26:21 ajacoutot Exp $
|
||||
--- scripts/xdg-screensaver.in.orig Thu Aug 28 12:00:25 2014
|
||||
+++ scripts/xdg-screensaver.in Thu Aug 28 12:00:25 2014
|
||||
@@ -27,7 +27,7 @@ _USAGE
|
||||
#@xdg-utils-common@
|
||||
|
||||
# Check if we can use "mv -T"
|
||||
-if mv -T ... ... 2>&1 | grep '\.\.\.' > /dev/null ; then
|
||||
+if false ; then
|
||||
# We can securely move files in /tmp with mv -T
|
||||
DEBUG 1 "mv -T available"
|
||||
MV="mv -T"
|
||||
@ -1,39 +0,0 @@
|
||||
$OpenBSD: patch-scripts_xdg-settings,v 1.1 2012/04/09 09:39:15 ajacoutot Exp $
|
||||
--- scripts/xdg-settings.orig Mon Apr 9 11:13:21 2012
|
||||
+++ scripts/xdg-settings Mon Apr 9 11:14:22 2012
|
||||
@@ -364,7 +364,7 @@ first_word()
|
||||
|
||||
binary_to_desktop_file()
|
||||
{
|
||||
- search="${XDG_DATA_HOME:-$HOME/.local/share}:${XDG_DATA_DIRS:-/usr/local/share:/usr/share}"
|
||||
+ search="${XDG_DATA_HOME:-$HOME/.local/share}:${XDG_DATA_DIRS:-${LOCALBASE}/share:/usr/share}"
|
||||
binary="`which "$1"`"
|
||||
binary="`readlink -f "$binary"`"
|
||||
base="`basename "$binary"`"
|
||||
@@ -392,7 +392,7 @@ binary_to_desktop_file()
|
||||
|
||||
desktop_file_to_binary()
|
||||
{
|
||||
- search="${XDG_DATA_HOME:-$HOME/.local/share}:${XDG_DATA_DIRS:-/usr/local/share:/usr/share}"
|
||||
+ search="${XDG_DATA_HOME:-$HOME/.local/share}:${XDG_DATA_DIRS:-${LOCALBASE}/share:/usr/share}"
|
||||
desktop="`basename "$1"`"
|
||||
IFS=:
|
||||
for dir in $search; do
|
||||
@@ -655,7 +655,7 @@ set_browser_gnome()
|
||||
|
||||
get_browser_xfce()
|
||||
{
|
||||
- search="${XDG_CONFIG_HOME:-$HOME/.config}:${XDG_CONFIG_DIRS:-/etc/xdg}"
|
||||
+ search="${XDG_CONFIG_HOME:-$HOME/.config}:${XDG_CONFIG_DIRS:-${SYSCONFDIR}/xdg}"
|
||||
IFS=:
|
||||
for dir in $search; do
|
||||
unset IFS
|
||||
@@ -688,7 +688,7 @@ check_xfce_desktop_file()
|
||||
# "Type" must be "X-XFCE-Helper"
|
||||
# "X-XFCE-Category" must be "WebBrowser" (for web browsers, anyway)
|
||||
# "X-XFCE-Commands" and "X-XFCE-CommandsWithParameter" must be set
|
||||
- search="${XDG_DATA_HOME:-$HOME/.local/share}:${XDG_DATA_DIRS:-/usr/local/share:/usr/share}"
|
||||
+ search="${XDG_DATA_HOME:-$HOME/.local/share}:${XDG_DATA_DIRS:-${LOCALBASE}/share:/usr/share}"
|
||||
IFS=:
|
||||
for dir in $search; do
|
||||
unset IFS
|
||||
23
devel/xdg-utils/patches/patch-scripts_xdg-utils-common_in
Normal file
23
devel/xdg-utils/patches/patch-scripts_xdg-utils-common_in
Normal file
@ -0,0 +1,23 @@
|
||||
$OpenBSD: patch-scripts_xdg-utils-common_in,v 1.1 2014/08/28 10:26:21 ajacoutot Exp $
|
||||
|
||||
Make xdg-open work with toad(8) under KDE4.
|
||||
|
||||
--- scripts/xdg-utils-common.in.orig Thu Aug 28 12:18:06 2014
|
||||
+++ scripts/xdg-utils-common.in Thu Aug 28 12:18:29 2014
|
||||
@@ -227,7 +227,7 @@ check_common_commands()
|
||||
;;
|
||||
|
||||
--version)
|
||||
- echo "@NAME@ 1.1.0 rc1"
|
||||
+ echo "@NAME@ 1.1.0 rc2"
|
||||
exit_success
|
||||
;;
|
||||
esac
|
||||
@@ -280,6 +280,7 @@ detectDE()
|
||||
if [ x"$DE" = x"" ]; then
|
||||
# classic fallbacks
|
||||
if [ x"$KDE_FULL_SESSION" != x"" ]; then DE=kde;
|
||||
+ elif `dbus-send --print-reply --dest=org.freedesktop.DBus /org/freedesktop/DBus org.freedesktop.DBus.GetNameOwner string:org.kde.KWin > /dev/null 2>&1` ; then DE=kde;
|
||||
elif [ x"$GNOME_DESKTOP_SESSION_ID" != x"" ]; then DE=gnome;
|
||||
elif [ x"$MATE_DESKTOP_SESSION_ID" != x"" ]; then DE=mate;
|
||||
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;
|
||||
Loading…
Reference in New Issue
Block a user