diff --git a/xdg-utils/.footprint b/xdg-utils/.footprint index 443d911b0..6bd9bb71e 100644 --- a/xdg-utils/.footprint +++ b/xdg-utils/.footprint @@ -9,6 +9,7 @@ drwxr-xr-x root/root usr/bin/ -rwxr-xr-x root/root usr/bin/xdg-screensaver -rwxr-xr-x root/root usr/bin/xdg-settings drwxr-xr-x root/root usr/share/ +drwxr-xr-x root/root usr/share/desktop-directories/ 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 diff --git a/xdg-utils/.signature b/xdg-utils/.signature index c16a59f06..e43ca1b25 100644 --- a/xdg-utils/.signature +++ b/xdg-utils/.signature @@ -1,6 +1,5 @@ untrusted comment: verify with /etc/ports/contrib.pub -RWSagIOpLGJF3/ym+MORnLrsErwFChD2GFj+xf4TZ8qFioNWaF+VDy6hNeWlRLK4epRndses8wRI07cBp8cPGLhwcUJLUXEfQgI= -SHA256 (Pkgfile) = 45b2d691e7861b384fe7adf4102b74a7688405950a7758106b9511fc2ec265b6 -SHA256 (.footprint) = a9295120258ac9623d6992d7f36cf65e45c2c853c96792921225d667087cf175 -SHA256 (xdg-utils-1.1.3.tar.gz) = d798b08af8a8e2063ddde6c9fa3398ca81484f27dec642c5627ffcaa0d4051d9 -SHA256 (drop_obsolete_GNOME_support.patch) = 2c23c73481000784a0bd9c0211a79e5b3674cbc97ce1eb36c0a180e46ddb45b0 +RWSagIOpLGJF359SmzjBnjpMNcYwYcAQho43JFsIN1Y1pbyRZtAYFmgVnpviLZk0MT/eJcm6reJRS5FjjhqcCd65HWF7YcbCdQY= +SHA256 (Pkgfile) = c5712ca40a355c6671fb84d990895cdc01c95898068ff52f8d0f150f71f87c5b +SHA256 (.footprint) = 2fc14a4b53cf1be725bfea1e26f240ae2d9c16faba09c811e33b50988a218213 +SHA256 (xdg-utils-v1.2.1.tar.bz2) = 93d510dccf328378f012fe195b4574c2fac1cd65a74d0852d6eaa72e5a2065a7 diff --git a/xdg-utils/Pkgfile b/xdg-utils/Pkgfile index fe490c9c1..7e5cb290f 100644 --- a/xdg-utils/Pkgfile +++ b/xdg-utils/Pkgfile @@ -4,17 +4,17 @@ # Depends on: xmlto lynx name=xdg-utils -version=1.1.3 +version=1.2.1 release=1 -source=(https://portland.freedesktop.org/download/$name-$version.tar.gz - drop_obsolete_GNOME_support.patch) +source=(https://gitlab.freedesktop.org/xdg/xdg-utils/-/archive/v$version/xdg-utils-v$version.tar.bz2) build() { - cd $name-$version - patch -Np1 -i ../drop_obsolete_GNOME_support.patch + cd $name-v$version ./configure --prefix=/usr \ --disable-nls make make DESTDIR=$PKG install + + mkdir $PKG/usr/share/desktop-directories } diff --git a/xdg-utils/drop_obsolete_GNOME_support.patch b/xdg-utils/drop_obsolete_GNOME_support.patch deleted file mode 100644 index f00325ff0..000000000 --- a/xdg-utils/drop_obsolete_GNOME_support.patch +++ /dev/null @@ -1,175 +0,0 @@ -From 21bb62e4ed715edb342bc6f1ca0983bd706228af Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Johannes=20L=C3=B6thberg?= -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