xdg-utils: bump to 1.1.3
This commit is contained in:
parent
e052d8d678
commit
e631068a7f
GPG Key ID:
42F8B4E30B673606
|
|
@ -7,12 +7,15 @@ drwxr-xr-x root/root usr/bin/
|
|||
-rwxr-xr-x root/root usr/bin/xdg-mime
|
||||
-rwxr-xr-x root/root usr/bin/xdg-open
|
||||
-rwxr-xr-x root/root usr/bin/xdg-screensaver
|
||||
drwxr-xr-x root/root usr/man/
|
||||
drwxr-xr-x root/root usr/man/man1/
|
||||
-rw-r--r-- root/root usr/man/man1/xdg-desktop-icon.1.gz
|
||||
-rw-r--r-- root/root usr/man/man1/xdg-desktop-menu.1.gz
|
||||
-rw-r--r-- root/root usr/man/man1/xdg-email.1.gz
|
||||
-rw-r--r-- root/root usr/man/man1/xdg-icon-resource.1.gz
|
||||
-rw-r--r-- root/root usr/man/man1/xdg-mime.1.gz
|
||||
-rw-r--r-- root/root usr/man/man1/xdg-open.1.gz
|
||||
-rw-r--r-- root/root usr/man/man1/xdg-screensaver.1.gz
|
||||
-rwxr-xr-x root/root usr/bin/xdg-settings
|
||||
drwxr-xr-x root/root usr/share/
|
||||
drwxr-xr-x root/root usr/share/man/
|
||||
drwxr-xr-x root/root usr/share/man/man1/
|
||||
-rw-r--r-- root/root usr/share/man/man1/xdg-desktop-icon.1.gz
|
||||
-rw-r--r-- root/root usr/share/man/man1/xdg-desktop-menu.1.gz
|
||||
-rw-r--r-- root/root usr/share/man/man1/xdg-email.1.gz
|
||||
-rw-r--r-- root/root usr/share/man/man1/xdg-icon-resource.1.gz
|
||||
-rw-r--r-- root/root usr/share/man/man1/xdg-mime.1.gz
|
||||
-rw-r--r-- root/root usr/share/man/man1/xdg-open.1.gz
|
||||
-rw-r--r-- root/root usr/share/man/man1/xdg-screensaver.1.gz
|
||||
-rw-r--r-- root/root usr/share/man/man1/xdg-settings.1.gz
|
||||
|
|
|
|||
|
|
@ -1,5 +1,6 @@
|
|||
untrusted comment: verify with /etc/ports/contrib.pub
|
||||
RWSagIOpLGJF38WrBNd50f55fADYb2vYRNLdI8W1z4M+FhoiIDZt4atfMKUccOjJshwwSizCbRLW6MsPT+0DLAmLjKx5gQ7N1wQ=
|
||||
SHA256 (Pkgfile) = 8373db156608b3766f556037bb35e60a6116bac865feb43c00d2e76573ef4293
|
||||
SHA256 (.footprint) = 219b6f0f5b423a388cd8c9173160ae32c73c915b202f3a7ad55c29707a9df367
|
||||
SHA256 (xdg-utils-1.0.2.tgz) = 21aeb7d16b2529b8d3975118f59eec09953e09f9a68d718159e98c90474b01ac
|
||||
RWSagIOpLGJF35RPhZBwd8LXgOUZNHo4Nb/IdMD+XiOFlHjPUKRIpjhNpkQ8GMuDMWQ0vWKy+7tsgSirKmzNjglGy41+E6/qrAg=
|
||||
SHA256 (Pkgfile) = f7defa741acafb6cd86dee3b5165490246d5a88185d239c9b54439b7dd09ea57
|
||||
SHA256 (.footprint) = a9295120258ac9623d6992d7f36cf65e45c2c853c96792921225d667087cf175
|
||||
SHA256 (xdg-utils-1.1.3.tar.gz) = d798b08af8a8e2063ddde6c9fa3398ca81484f27dec642c5627ffcaa0d4051d9
|
||||
SHA256 (drop_obsolete_GNOME_support.patch) = 2c23c73481000784a0bd9c0211a79e5b3674cbc97ce1eb36c0a180e46ddb45b0
|
||||
|
|
|
|||
|
|
@ -1,17 +1,19 @@
|
|||
# Description: Command line tools for desktop integration tasks.
|
||||
# URL: http://portland.freedesktop.org/
|
||||
# Maintainer: Fredrik Rinnestam, fredrik at crux dot guru
|
||||
# Depends on:
|
||||
# URL: http://portland.freedesktop.org/
|
||||
# Maintainer: Tim Biermann, tbier at posteo dot de
|
||||
# Packager: Fredrik Rinnestam, fredrik at crux dot guru
|
||||
# Depends on: xmlto lynx
|
||||
|
||||
name=xdg-utils
|
||||
version=1.0.2
|
||||
version=1.1.3
|
||||
release=1
|
||||
source=(http://portland.freedesktop.org/download/$name-$version.tgz)
|
||||
source=(http://portland.freedesktop.org/download/$name-$version.tar.gz drop_obsolete_GNOME_support.patch)
|
||||
|
||||
build() {
|
||||
cd $name-$version
|
||||
./configure --prefix=/usr \
|
||||
--disable-nls
|
||||
make
|
||||
make DESTDIR=${PKG} install
|
||||
cd $name-$version
|
||||
patch -Np1 -i ../drop_obsolete_GNOME_support.patch
|
||||
./configure --prefix=/usr \
|
||||
--disable-nls
|
||||
make
|
||||
make DESTDIR=$PKG install
|
||||
}
|
||||
|
|
|
|||
175
xdg-utils/drop_obsolete_GNOME_support.patch
Normal file
175
xdg-utils/drop_obsolete_GNOME_support.patch
Normal file
|
|
@ -0,0 +1,175 @@
|
|||
From 21bb62e4ed715edb342bc6f1ca0983bd706228af Mon Sep 17 00:00:00 2001
|
||||
From: =?UTF-8?q?Johannes=20L=C3=B6thberg?= <johannes@kyriasis.com>
|
||||
Date: Fri, 29 May 2015 20:53:54 +0200
|
||||
Subject: [PATCH] xdg-desktop-menu: Drop obsolete GNOME support
|
||||
|
||||
This commit drops the obsolete support for the GNOME-specific directory
|
||||
for .desktop files, since it has not been needed since GNOME 2.10, and
|
||||
since it forces the creation of ~/.gnome whether you want it or not.
|
||||
|
||||
https://bugs.freedesktop.org/show_bug.cgi?id=90775
|
||||
---
|
||||
scripts/xdg-desktop-menu.in | 47 +++++++++------------------------------------
|
||||
1 file changed, 9 insertions(+), 38 deletions(-)
|
||||
|
||||
diff --git a/scripts/xdg-desktop-menu.in b/scripts/xdg-desktop-menu.in
|
||||
index 13159cb..8654764 100644
|
||||
--- a/scripts/xdg-desktop-menu.in
|
||||
+++ b/scripts/xdg-desktop-menu.in
|
||||
@@ -126,22 +126,18 @@ update_submenu()
|
||||
DEBUG 3 "xdg_global_dir: $xdg_global_dir"
|
||||
DEBUG 3 "kde_user_dir: $kde_user_dir"
|
||||
DEBUG 3 "kde_global_dir: $kde_global_dir"
|
||||
- DEBUG 3 "gnome_user_dir: $gnome_user_dir"
|
||||
- DEBUG 3 "gnome_global_dir: $gnome_global_dir"
|
||||
|
||||
if [ x"$mode" = x"user" ] ; then
|
||||
xdg_dir="$xdg_user_dir"
|
||||
kde_dir="$kde_user_dir"
|
||||
- gnome_dir="$gnome_user_dir"
|
||||
my_umask=077
|
||||
my_chmod=0600
|
||||
else
|
||||
xdg_dir="$xdg_global_dir"
|
||||
kde_dir="$kde_global_dir"
|
||||
- gnome_dir="$gnome_global_dir"
|
||||
my_umask=022
|
||||
my_chmod=0644
|
||||
- if [ -z "${xdg_dir}${kde_dir}${gnome_dir}" ] ; then
|
||||
+ if [ -z "${xdg_dir}${kde_dir}" ] ; then
|
||||
exit_failure_operation_impossible "No writable system menu directory found."
|
||||
fi
|
||||
fi
|
||||
@@ -158,15 +154,6 @@ update_submenu()
|
||||
return
|
||||
fi
|
||||
|
||||
- if [ $action = "install" ] && [ -f "/etc/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
|
||||
- DEBUG 1 "Debian Workaround: Link '$xdg_dir' to '$gnome_xdg_dir'"
|
||||
- mkdir -p `dirname "$gnome_xdg_dir"`
|
||||
- eval 'ln -s "applications-merged" "$gnome_xdg_dir"'$xdg_redirect_output
|
||||
- fi
|
||||
- fi
|
||||
if [ $action = "install" ] && [ -f "/etc/mandrake-release" ] ; then
|
||||
# Work around for Mandriva 2006
|
||||
mandrake_xdg_dir=`echo "$xdg_dir" | sed -e 's^/applications-merged^/applications-mdk-merged^'`
|
||||
@@ -489,20 +476,16 @@ DEBUG 3 "xdg_user_dir: $xdg_user_dir"
|
||||
DEBUG 3 "xdg_global_dir: $xdg_global_dir"
|
||||
DEBUG 3 "kde_user_dir: $kde_user_dir"
|
||||
DEBUG 3 "kde_global_dir: $kde_global_dir"
|
||||
-DEBUG 3 "gnome_user_dir: $gnome_user_dir"
|
||||
-DEBUG 3 "gnome_global_dir: $gnome_global_dir"
|
||||
|
||||
if [ x"$mode" = x"user" ] ; then
|
||||
xdg_dir="$xdg_user_dir"
|
||||
kde_dir="$kde_user_dir"
|
||||
- gnome_dir="$gnome_user_dir"
|
||||
my_umask=077
|
||||
else
|
||||
xdg_dir="$xdg_global_dir"
|
||||
kde_dir="$kde_global_dir"
|
||||
- gnome_dir="$gnome_global_dir"
|
||||
my_umask=022
|
||||
- if [ -z "${xdg_dir}${kde_dir}${gnome_dir}" ] ; then
|
||||
+ if [ -z "${xdg_dir}${kde_dir}" ] ; then
|
||||
exit_failure_operation_impossible "No writable system menu directory found."
|
||||
fi
|
||||
fi
|
||||
@@ -510,14 +493,14 @@ fi
|
||||
for desktop_file in $directory_files; do
|
||||
basefile=`basename "$desktop_file"`
|
||||
|
||||
- DEBUG 1 "$action $desktop_file in $xdg_dir $kde_dir $gnome_dir"
|
||||
+ DEBUG 1 "$action $desktop_file in $xdg_dir $kde_dir"
|
||||
|
||||
case $action in
|
||||
install)
|
||||
save_umask=`umask`
|
||||
umask $my_umask
|
||||
|
||||
- for x in $xdg_dir $kde_dir $gnome_dir ; do
|
||||
+ for x in $xdg_dir $kde_dir ; do
|
||||
mkdir -p $x
|
||||
eval 'cp $desktop_file $x/$basefile'$xdg_redirect_output
|
||||
done
|
||||
@@ -526,7 +509,7 @@ for desktop_file in $directory_files; do
|
||||
;;
|
||||
|
||||
uninstall)
|
||||
- for x in $xdg_dir $kde_dir $gnome_dir ; do
|
||||
+ for x in $xdg_dir $kde_dir ; do
|
||||
rm -f $x/$basefile
|
||||
done
|
||||
|
||||
@@ -555,29 +538,21 @@ kde_user_dir=`kde${KDE_SESSION_VERSION}-config --path apps 2> /dev/null | cut -d
|
||||
kde_global_dir=`kde${KDE_SESSION_VERSION}-config --path apps 2> /dev/null | cut -d ':' -f 2`
|
||||
[ -w $kde_global_dir ] || kde_global_dir=
|
||||
|
||||
-gnome_user_dir="$HOME/.gnome/apps"
|
||||
-gnome_global_dir="/usr/share/gnome/apps"
|
||||
-[ -w $gnome_global_dir ] || gnome_global_dir=
|
||||
-
|
||||
DEBUG 3 "Install locations for *.desktop files:"
|
||||
DEBUG 3 "xdg_user_dir: $xdg_user_dir"
|
||||
DEBUG 3 "xdg_global_dir: $xdg_global_dir"
|
||||
DEBUG 3 "kde_user_dir: $kde_user_dir"
|
||||
DEBUG 3 "kde_global_dir: $kde_global_dir"
|
||||
-DEBUG 3 "gnome_user_dir: $gnome_user_dir"
|
||||
-DEBUG 3 "gnome_global_dir: $gnome_global_dir"
|
||||
|
||||
if [ x"$mode" = x"user" ] ; then
|
||||
xdg_dir="$xdg_user_dir"
|
||||
kde_dir="$kde_user_dir"
|
||||
- gnome_dir="$gnome_user_dir"
|
||||
my_umask=077
|
||||
else
|
||||
xdg_dir="$xdg_global_dir"
|
||||
kde_dir="$kde_global_dir"
|
||||
- gnome_dir="$gnome_global_dir"
|
||||
my_umask=022
|
||||
- if [ -z "${xdg_dir}${kde_dir}${gnome_dir}" ] ; then
|
||||
+ if [ -z "${xdg_dir}${kde_dir}" ] ; then
|
||||
exit_failure_operation_impossible "No writable system menu directory found."
|
||||
fi
|
||||
fi
|
||||
@@ -589,14 +564,14 @@ for desktop_file in $desktop_files; do
|
||||
|
||||
basefile=`basename "$desktop_file"`
|
||||
|
||||
- DEBUG 1 "$action $desktop_file in $xdg_dir $kde_dir $gnome_dir"
|
||||
+ DEBUG 1 "$action $desktop_file in $xdg_dir $kde_dir"
|
||||
|
||||
case $action in
|
||||
install)
|
||||
save_umask=`umask`
|
||||
umask $my_umask
|
||||
|
||||
- for x in $xdg_dir $kde_dir $gnome_dir ; do
|
||||
+ for x in $xdg_dir $kde_dir ; do
|
||||
mkdir -p $x
|
||||
eval 'cp $desktop_file $x/$basefile'$xdg_redirect_output
|
||||
done
|
||||
@@ -605,17 +580,13 @@ for desktop_file in $desktop_files; do
|
||||
echo "OnlyShowIn=Old;" >> $kde_dir/$basefile
|
||||
fi
|
||||
|
||||
- if [ -f $gnome_dir/$basefile ] ; then
|
||||
- echo "OnlyShowIn=Old;" >> $gnome_dir/$basefile
|
||||
- fi
|
||||
-
|
||||
make_lazy_default "$xdg_dir" "$basefile"
|
||||
|
||||
umask $save_umask
|
||||
;;
|
||||
|
||||
uninstall)
|
||||
- for x in $xdg_dir $kde_dir $gnome_dir ; do
|
||||
+ for x in $xdg_dir $kde_dir ; do
|
||||
rm -f $x/$basefile
|
||||
done
|
||||
|
||||
--
|
||||
2.4.2
|
||||
Loading…
Reference in New Issue
Block a user