[arch-commits] Commit in xdg-utils/repos/extra-any (6 files)
Andreas Radke
andyrtr at archlinux.org
Wed Nov 20 20:22:03 UTC 2019
Date: Wednesday, November 20, 2019 @ 20:22:01
Author: andyrtr
Revision: 369501
archrelease: copy trunk to extra-any
Added:
xdg-utils/repos/extra-any/0001_better_pcmanfm_check.patch
(from rev 369500, xdg-utils/trunk/0001_better_pcmanfm_check.patch)
xdg-utils/repos/extra-any/PKGBUILD
(from rev 369500, xdg-utils/trunk/PKGBUILD)
xdg-utils/repos/extra-any/drop_obsolete_GNOME_support.patch
(from rev 369500, xdg-utils/trunk/drop_obsolete_GNOME_support.patch)
Deleted:
xdg-utils/repos/extra-any/0001_better_pcmanfm_check.patch
xdg-utils/repos/extra-any/PKGBUILD
xdg-utils/repos/extra-any/drop_obsolete_GNOME_support.patch
-----------------------------------+
0001_better_pcmanfm_check.patch | 54 ++---
PKGBUILD | 121 ++++++------
drop_obsolete_GNOME_support.patch | 350 ++++++++++++++++++------------------
3 files changed, 262 insertions(+), 263 deletions(-)
Deleted: 0001_better_pcmanfm_check.patch
===================================================================
--- 0001_better_pcmanfm_check.patch 2019-11-20 20:21:46 UTC (rev 369500)
+++ 0001_better_pcmanfm_check.patch 2019-11-20 20:22:01 UTC (rev 369501)
@@ -1,27 +0,0 @@
-From 31525d3855f876ddf2e29091b2e8d376f923e09e Mon Sep 17 00:00:00 2001
-From: Rex Dieter <rdieter at gmail.com>
-Date: Thu, 24 May 2018 14:40:53 -0500
-Subject: xdg-open: better pcmanfm check (BR106636,BR106161)
-
----
- ChangeLog | 2 ++
- scripts/xdg-open.in | 2 +-
- 2 files changed, 3 insertions(+), 1 deletion(-)
-
-diff --git a/scripts/xdg-open.in b/scripts/xdg-open.in
-index 630e63e..bf9da4c 100644
---- a/scripts/xdg-open.in
-+++ b/scripts/xdg-open.in
-@@ -451,7 +451,7 @@ open_lxde()
- {
-
- # pcmanfm only knows how to handle file:// urls and filepaths, it seems.
-- if pcmanfm --help >/dev/null 2>&1 -a is_file_url_or_path "$1"; then
-+ if pcmanfm --help >/dev/null 2>&1 && is_file_url_or_path "$1"; then
- local file="$(file_url_to_path "$1")"
-
- # handle relative paths
---
-cgit v1.1
-
-
Copied: xdg-utils/repos/extra-any/0001_better_pcmanfm_check.patch (from rev 369500, xdg-utils/trunk/0001_better_pcmanfm_check.patch)
===================================================================
--- 0001_better_pcmanfm_check.patch (rev 0)
+++ 0001_better_pcmanfm_check.patch 2019-11-20 20:22:01 UTC (rev 369501)
@@ -0,0 +1,27 @@
+From 31525d3855f876ddf2e29091b2e8d376f923e09e Mon Sep 17 00:00:00 2001
+From: Rex Dieter <rdieter at gmail.com>
+Date: Thu, 24 May 2018 14:40:53 -0500
+Subject: xdg-open: better pcmanfm check (BR106636,BR106161)
+
+---
+ ChangeLog | 2 ++
+ scripts/xdg-open.in | 2 +-
+ 2 files changed, 3 insertions(+), 1 deletion(-)
+
+diff --git a/scripts/xdg-open.in b/scripts/xdg-open.in
+index 630e63e..bf9da4c 100644
+--- a/scripts/xdg-open.in
++++ b/scripts/xdg-open.in
+@@ -451,7 +451,7 @@ open_lxde()
+ {
+
+ # pcmanfm only knows how to handle file:// urls and filepaths, it seems.
+- if pcmanfm --help >/dev/null 2>&1 -a is_file_url_or_path "$1"; then
++ if pcmanfm --help >/dev/null 2>&1 && is_file_url_or_path "$1"; then
+ local file="$(file_url_to_path "$1")"
+
+ # handle relative paths
+--
+cgit v1.1
+
+
Deleted: PKGBUILD
===================================================================
--- PKGBUILD 2019-11-20 20:21:46 UTC (rev 369500)
+++ PKGBUILD 2019-11-20 20:22:01 UTC (rev 369501)
@@ -1,61 +0,0 @@
-# Maintainer: Andreas Radke <andyrtr at archlinux.org>
-# Maintainer: Jan de Groot <jgc at archlinux.org>
-
-pkgname=xdg-utils
-# https://gitlab.freedesktop.org/xdg/xdg-utils/commits/master
-_commit=0547886c0a7ae79145998495a6e3af6a1450d0c7 # master # 2019-04-19
-pkgver=1.1.3+18+g0547886
-pkgrel=3
-pkgdesc="Command line tools that assist applications with a variety of desktop integration tasks"
-arch=('any')
-url="https://www.freedesktop.org/wiki/Software/xdg-utils/"
-license=('MIT')
-depends=('sh' 'which' 'file' 'xorg-xset' 'xorg-xprop') # xset + xprop needed inside xdg-screensaver
-makedepends=('docbook-xsl' 'lynx' 'xmlto' 'git')
-optdepends=('kde-cli-tools: for KDE Plasma5 support in xdg-open'
- 'exo: for Xfce support in xdg-open'
- 'xorg-xprop: for Xfce support in xdg-open'
- 'pcmanfm: for LXDE support in xdg-open'
- 'perl-file-mimeinfo: for generic support in xdg-open'
- 'perl-net-dbus: Perl extension to dbus used in xdg-screensaver'
- 'perl-x11-protocol: Perl X11 protocol used in xdg-screensaver')
-source=(#https://portland.freedesktop.org/download/$pkgname-$pkgver.tar.gz
- #0001_better_pcmanfm_check.patch
- #drop_obsolete_GNOME_support.patch) #{,.asc}
- "git+https://gitlab.freedesktop.org/xdg/xdg-utils.git#commit=$_commit"
-)
-#sha1sums=('98294cf332c341b85e481d98e9ea59357fe1efc7'
-# 'f5c09cc10d7b88c2033392efd4179da65a1f47b1'
-# '32d4282c2e6c7345ddf04016c91f0defbf88b356')
-sha256sums=('SKIP')
-#validpgpkeys=('8B75CA7811367175D05F3B03C43570F80CC295E6') # "Per Olofsson <pelle at pqz.se>"
-
-pkgver() {
- cd $pkgname
- git describe --tags | sed 's/^v//;s/-/+/g'
-}
-
-#prepare() {
-# cd $pkgname #-$pkgver
-# # FS#58707
-# patch -Np1 -i ../0001_better_pcmanfm_check.patch
-# # drop Gnome2 support - FS58096/https://bugs.freedesktop.org/show_bug.cgi?id=90775
-# patch -Np1 -i ../drop_obsolete_GNOME_support.patch
-
-# NOCONFIGURE=1 ./autogen.sh
-#}
-
-build() {
- cd $pkgname #-$pkgver
- ./configure --prefix=/usr --mandir=/usr/share/man
- make
-}
-
-package() {
- cd $pkgname #-$pkgver
- make DESTDIR="${pkgdir}" install
- install -D -m644 LICENSE "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
-
- # install empty directory to prevent xdg-desktop-menu install *.desktop to fail, see FS#33316
- install -dm755 "$pkgdir"/usr/share/desktop-directories
-}
Copied: xdg-utils/repos/extra-any/PKGBUILD (from rev 369500, xdg-utils/trunk/PKGBUILD)
===================================================================
--- PKGBUILD (rev 0)
+++ PKGBUILD 2019-11-20 20:22:01 UTC (rev 369501)
@@ -0,0 +1,60 @@
+# Maintainer: Andreas Radke <andyrtr at archlinux.org>
+# Maintainer: Jan de Groot <jgc at archlinux.org>
+
+pkgname=xdg-utils
+# https://gitlab.freedesktop.org/xdg/xdg-utils/commits/master
+_commit=0547886c0a7ae79145998495a6e3af6a1450d0c7 # master # 2019-04-19
+pkgver=1.1.3+18+g0547886
+pkgrel=4
+pkgdesc="Command line tools that assist applications with a variety of desktop integration tasks"
+arch=('any')
+url="https://www.freedesktop.org/wiki/Software/xdg-utils/"
+license=('MIT')
+depends=('sh' 'which' 'file' 'xorg-xset' 'xorg-xprop') # xset + xprop needed inside xdg-screensaver
+makedepends=('docbook-xsl' 'lynx' 'xmlto' 'git')
+optdepends=('kde-cli-tools: for KDE Plasma5 support in xdg-open'
+ 'exo: for Xfce support in xdg-open'
+ 'pcmanfm: for LXDE support in xdg-open'
+ 'perl-file-mimeinfo: for generic support in xdg-open'
+ 'perl-net-dbus: Perl extension to dbus used in xdg-screensaver'
+ 'perl-x11-protocol: Perl X11 protocol used in xdg-screensaver')
+source=(#https://portland.freedesktop.org/download/$pkgname-$pkgver.tar.gz
+ #0001_better_pcmanfm_check.patch
+ #drop_obsolete_GNOME_support.patch) #{,.asc}
+ "git+https://gitlab.freedesktop.org/xdg/xdg-utils.git#commit=$_commit"
+)
+#sha1sums=('98294cf332c341b85e481d98e9ea59357fe1efc7'
+# 'f5c09cc10d7b88c2033392efd4179da65a1f47b1'
+# '32d4282c2e6c7345ddf04016c91f0defbf88b356')
+sha256sums=('SKIP')
+#validpgpkeys=('8B75CA7811367175D05F3B03C43570F80CC295E6') # "Per Olofsson <pelle at pqz.se>"
+
+pkgver() {
+ cd $pkgname
+ git describe --tags | sed 's/^v//;s/-/+/g'
+}
+
+#prepare() {
+# cd $pkgname #-$pkgver
+# # FS#58707
+# patch -Np1 -i ../0001_better_pcmanfm_check.patch
+# # drop Gnome2 support - FS58096/https://bugs.freedesktop.org/show_bug.cgi?id=90775
+# patch -Np1 -i ../drop_obsolete_GNOME_support.patch
+
+# NOCONFIGURE=1 ./autogen.sh
+#}
+
+build() {
+ cd $pkgname #-$pkgver
+ ./configure --prefix=/usr --mandir=/usr/share/man
+ make
+}
+
+package() {
+ cd $pkgname #-$pkgver
+ make DESTDIR="${pkgdir}" install
+ install -D -m644 LICENSE "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
+
+ # install empty directory to prevent xdg-desktop-menu install *.desktop to fail, see FS#33316
+ install -dm755 "$pkgdir"/usr/share/desktop-directories
+}
Deleted: drop_obsolete_GNOME_support.patch
===================================================================
--- drop_obsolete_GNOME_support.patch 2019-11-20 20:21:46 UTC (rev 369500)
+++ drop_obsolete_GNOME_support.patch 2019-11-20 20:22:01 UTC (rev 369501)
@@ -1,175 +0,0 @@
-From 21bb62e4ed715edb342bc6f1ca0983bd706228af Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Johannes=20L=C3=B6thberg?= <johannes at 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
Copied: xdg-utils/repos/extra-any/drop_obsolete_GNOME_support.patch (from rev 369500, xdg-utils/trunk/drop_obsolete_GNOME_support.patch)
===================================================================
--- drop_obsolete_GNOME_support.patch (rev 0)
+++ drop_obsolete_GNOME_support.patch 2019-11-20 20:22:01 UTC (rev 369501)
@@ -0,0 +1,175 @@
+From 21bb62e4ed715edb342bc6f1ca0983bd706228af Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Johannes=20L=C3=B6thberg?= <johannes at 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
More information about the arch-commits
mailing list