Browse Source

rm xorg pkgs

master
artoo 1 month ago
parent
commit
970361185c
Signed by: artoo <artoo@artixlinux.org> GPG Key ID: 3292CD0BB0DB310B

+ 0
- 5
hicolor-icon-theme/.artixlinux/agent.yaml View File

@@ -1,5 +0,0 @@
%YAML 1.2
---

label: master


+ 0
- 33
hicolor-icon-theme/.gitignore View File

@@ -1,33 +0,0 @@
# ---> ArchLinuxPackages
*.tar
*.tar.*
*.jar
*.exe
*.msi
*.zip
*.tgz
*.log
*.log.*
*.sig

pkg/
src/


# ---> Archives
*.7z
*.rar
*.gz
*.bzip
*.bz2
*.xz
*.lzma
*.cab

# ---> systemd
*.service
*.socket
*.timer

# ---> snap
*.snap

+ 0
- 13
hicolor-icon-theme/.gitrepo View File

@@ -1,13 +0,0 @@
; DO NOT EDIT (unless you know what you are doing)
;
; This subdirectory is a git "subrepo", and this file is maintained by the
; git-subrepo command. See https://github.com/git-commands/git-subrepo#readme
;
[subrepo]
remote = gitea@gitea.artixlinux.org:packagesH/hicolor-icon-theme.git
branch = master
commit = c9caf1b1164a28afb61320f31fec4e571545ada6
parent = fe242f2f64298707742c50b3dec35ef7ceb02949
method = merge
update = auto
cmdver = 0.4.0

+ 0
- 3
hicolor-icon-theme/Jenkinsfile View File

@@ -1,3 +0,0 @@
@Library('artix-ci') import org.artixlinux.RepoPackage

PackagePipeline(new RepoPackage(this))

+ 0
- 2
hicolor-icon-theme/README.md View File

@@ -1,2 +0,0 @@
# hicolor-icon-theme


+ 0
- 23
hicolor-icon-theme/repos/extra-any/PKGBUILD View File

@@ -1,23 +0,0 @@
# $Id$
# Maintainer: Jan De Groot <jgc@archlinux.org>

pkgname=hicolor-icon-theme
pkgver=0.17
pkgrel=1
pkgdesc="Freedesktop.org Hicolor icon theme"
arch=('any')
url="https://www.freedesktop.org/wiki/Software/icon-theme/"
license=('GPL2')
source=("https://icon-theme.freedesktop.org/releases/${pkgname}-${pkgver}.tar.xz")
sha256sums=('317484352271d18cbbcfac3868eab798d67fff1b8402e740baa6ff41d588a9d8')

build() {
cd $pkgname-$pkgver
./configure --prefix=/usr
make
}

package() {
cd $pkgname-$pkgver
make DESTDIR="${pkgdir}" install
}

+ 0
- 23
hicolor-icon-theme/trunk/PKGBUILD View File

@@ -1,23 +0,0 @@
# $Id$
# Maintainer: Jan De Groot <jgc@archlinux.org>

pkgname=hicolor-icon-theme
pkgver=0.17
pkgrel=1
pkgdesc="Freedesktop.org Hicolor icon theme"
arch=('any')
url="https://www.freedesktop.org/wiki/Software/icon-theme/"
license=('GPL2')
source=("https://icon-theme.freedesktop.org/releases/${pkgname}-${pkgver}.tar.xz")
sha256sums=('317484352271d18cbbcfac3868eab798d67fff1b8402e740baa6ff41d588a9d8')

build() {
cd $pkgname-$pkgver
./configure --prefix=/usr
make
}

package() {
cd $pkgname-$pkgver
make DESTDIR="${pkgdir}" install
}

+ 0
- 5
xclip/.artixlinux/agent.yaml View File

@@ -1,5 +0,0 @@
%YAML 1.2
---

label: master


+ 0
- 33
xclip/.gitignore View File

@@ -1,33 +0,0 @@
# ---> ArchLinuxPackages
*.tar
*.tar.*
*.jar
*.exe
*.msi
*.zip
*.tgz
*.log
*.log.*
*.sig

pkg/
src/


# ---> Archives
*.7z
*.rar
*.gz
*.bzip
*.bz2
*.xz
*.lzma
*.cab

# ---> systemd
*.service
*.socket
*.timer

# ---> snap
*.snap

+ 0
- 13
xclip/.gitrepo View File

@@ -1,13 +0,0 @@
; DO NOT EDIT (unless you know what you are doing)
;
; This subdirectory is a git "subrepo", and this file is maintained by the
; git-subrepo command. See https://github.com/git-commands/git-subrepo#readme
;
[subrepo]
remote = gitea@gitea.artixlinux.org:packagesX/xclip.git
branch = master
commit = 353dc2c49e56a00652d23cfa9ed14c85d0654d05
parent = bd6e7c341f27a1d7fce06bb9ec003bbac34b11ee
method = merge
update = auto
cmdver = 0.4.1

+ 0
- 3
xclip/Jenkinsfile View File

@@ -1,3 +0,0 @@
@Library('artix-ci') import org.artixlinux.RepoPackage

PackagePipeline(new RepoPackage(this))

+ 0
- 2
xclip/README.md View File

@@ -1,2 +0,0 @@
# xclip


+ 0
- 27
xclip/repos/extra-x86_64/PKGBUILD View File

@@ -1,27 +0,0 @@
# Maintainer: Gaetan Bisson <bisson@archlinux.org>
# Committer: Manolis Tzanidakis <manolis@archlinux.org>
# Contributor: damir <damir@archlinux.org>

pkgname=xclip
pkgver=0.13
pkgrel=2
pkgdesc='Command line interface to the X11 clipboard'
url='https://github.com/astrand/xclip'
arch=('x86_64')
license=('GPL')
depends=('libxmu')
makedepends=('git')
source=('git+https://github.com/astrand/xclip#commit=9aa7090c3b8b437c6489edca32ae43d82e0c1281')
sha256sums=('SKIP')

build() {
cd "${srcdir}/${pkgname}"
./bootstrap
./configure --prefix=/usr
make
}

package() {
cd "${srcdir}/${pkgname}"
make DESTDIR="${pkgdir}" install
}

+ 0
- 27
xclip/trunk/PKGBUILD View File

@@ -1,27 +0,0 @@
# Maintainer: Gaetan Bisson <bisson@archlinux.org>
# Committer: Manolis Tzanidakis <manolis@archlinux.org>
# Contributor: damir <damir@archlinux.org>

pkgname=xclip
pkgver=0.13
pkgrel=2
pkgdesc='Command line interface to the X11 clipboard'
url='https://github.com/astrand/xclip'
arch=('x86_64')
license=('GPL')
depends=('libxmu')
makedepends=('git')
source=('git+https://github.com/astrand/xclip#commit=9aa7090c3b8b437c6489edca32ae43d82e0c1281')
sha256sums=('SKIP')

build() {
cd "${srcdir}/${pkgname}"
./bootstrap
./configure --prefix=/usr
make
}

package() {
cd "${srcdir}/${pkgname}"
make DESTDIR="${pkgdir}" install
}

+ 0
- 5
xdg-user-dirs/.artixlinux/agent.yaml View File

@@ -1,5 +0,0 @@
%YAML 1.2
---

label: master


+ 0
- 33
xdg-user-dirs/.gitignore View File

@@ -1,33 +0,0 @@
# ---> ArchLinuxPackages
*.tar
*.tar.*
*.jar
*.exe
*.msi
*.zip
*.tgz
*.log
*.log.*
*.sig

pkg/
src/


# ---> Archives
*.7z
*.rar
*.gz
*.bzip
*.bz2
*.xz
*.lzma
*.cab

# ---> systemd
*.service
*.socket
*.timer

# ---> snap
*.snap

+ 0
- 13
xdg-user-dirs/.gitrepo View File

@@ -1,13 +0,0 @@
; DO NOT EDIT (unless you know what you are doing)
;
; This subdirectory is a git "subrepo", and this file is maintained by the
; git-subrepo command. See https://github.com/git-commands/git-subrepo#readme
;
[subrepo]
remote = gitea@gitea.artixlinux.org:packagesX/xdg-user-dirs.git
branch = master
commit = 003ce72d6cca46c21af17dc15346dd6da37073ce
parent = b4aaf06b7415fff67ae0e8adb8bfa0ce341924ec
method = merge
update = auto
cmdver = 0.4.0

+ 0
- 3
xdg-user-dirs/Jenkinsfile View File

@@ -1,3 +0,0 @@
@Library('artix-ci') import org.artixlinux.RepoPackage

PackagePipeline(new RepoPackage(this))

+ 0
- 2
xdg-user-dirs/README.md View File

@@ -1,2 +0,0 @@
# xdg-user-dirs


+ 0
- 39
xdg-user-dirs/repos/extra-x86_64/PKGBUILD View File

@@ -1,39 +0,0 @@
# Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com>
# Contributor: Stefan Husmann <stefan-husmann@t-online.de>
# Contributor: <mathieu.clabaut@gmail.com>

pkgname=xdg-user-dirs
pkgver=0.17
pkgrel=2
pkgdesc="Manage user directories like ~/Desktop and ~/Music"
arch=(x86_64)
url="https://www.freedesktop.org/wiki/Software/xdg-user-dirs"
license=(GPL)
depends=(sh)
makedepends=(docbook-xsl git)
backup=(etc/xdg/user-dirs.conf etc/xdg/user-dirs.defaults)
options=(!emptydirs)
_commit=ec015cdd345dec8025948533e7a6f18680e7f70c # tags/0.17^0
source=("git+https://gitlab.freedesktop.org/xdg/xdg-user-dirs.git#commit=$_commit")
sha256sums=('SKIP')

pkgver() {
cd $pkgname
git describe --tags | sed 's/-/+/g'
}

prepare() {
cd $pkgname
NOCONFIGURE=1 ./autogen.sh
}

build() {
cd $pkgname
./configure --prefix=/usr --sysconfdir=/etc
make
}

package() {
cd $pkgname
make DESTDIR="$pkgdir" install
}

+ 0
- 39
xdg-user-dirs/trunk/PKGBUILD View File

@@ -1,39 +0,0 @@
# Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com>
# Contributor: Stefan Husmann <stefan-husmann@t-online.de>
# Contributor: <mathieu.clabaut@gmail.com>

pkgname=xdg-user-dirs
pkgver=0.17
pkgrel=2
pkgdesc="Manage user directories like ~/Desktop and ~/Music"
arch=(x86_64)
url="https://www.freedesktop.org/wiki/Software/xdg-user-dirs"
license=(GPL)
depends=(sh)
makedepends=(docbook-xsl git)
backup=(etc/xdg/user-dirs.conf etc/xdg/user-dirs.defaults)
options=(!emptydirs)
_commit=ec015cdd345dec8025948533e7a6f18680e7f70c # tags/0.17^0
source=("git+https://gitlab.freedesktop.org/xdg/xdg-user-dirs.git#commit=$_commit")
sha256sums=('SKIP')

pkgver() {
cd $pkgname
git describe --tags | sed 's/-/+/g'
}

prepare() {
cd $pkgname
NOCONFIGURE=1 ./autogen.sh
}

build() {
cd $pkgname
./configure --prefix=/usr --sysconfdir=/etc
make
}

package() {
cd $pkgname
make DESTDIR="$pkgdir" install
}

+ 0
- 5
xdg-utils/.artixlinux/agent.yaml View File

@@ -1,5 +0,0 @@
%YAML 1.2
---

label: master


+ 0
- 33
xdg-utils/.gitignore View File

@@ -1,33 +0,0 @@
# ---> ArchLinuxPackages
*.tar
*.tar.*
*.jar
*.exe
*.msi
*.zip
*.tgz
*.log
*.log.*
*.sig

pkg/
src/


# ---> Archives
*.7z
*.rar
*.gz
*.bzip
*.bz2
*.xz
*.lzma
*.cab

# ---> systemd
*.service
*.socket
*.timer

# ---> snap
*.snap

+ 0
- 13
xdg-utils/.gitrepo View File

@@ -1,13 +0,0 @@
; DO NOT EDIT (unless you know what you are doing)
;
; This subdirectory is a git "subrepo", and this file is maintained by the
; git-subrepo command. See https://github.com/git-commands/git-subrepo#readme
;
[subrepo]
remote = gitea@gitea.artixlinux.org:packagesX/xdg-utils.git
branch = master
commit = 249e86e7be75759429aa9497b8b2e6a0c57ae133
parent = 944a10ae825dd1cc19afb9b45b0e9e039a1c5acc
method = merge
update = auto
cmdver = 0.4.0

+ 0
- 3
xdg-utils/Jenkinsfile View File

@@ -1,3 +0,0 @@
@Library('artix-ci') import org.artixlinux.RepoPackage

PackagePipeline(new RepoPackage(this))

+ 0
- 2
xdg-utils/README.md View File

@@ -1,2 +0,0 @@
# xdg-utils


+ 0
- 26
xdg-utils/repos/extra-any/0001_better_pcmanfm_check.patch View File

@@ -1,27 +0,0 @@
From 31525d3855f876ddf2e29091b2e8d376f923e09e Mon Sep 17 00:00:00 2001
From: Rex Dieter <rdieter@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



+ 0
- 50
xdg-utils/repos/extra-any/PKGBUILD View File

@@ -1,50 +0,0 @@
# $Id$
# Maintainer: Andreas Radke <andyrtr@archlinux.org>
# Maintainer: Jan de Groot <jgc@archlinux.org>

pkgname=xdg-utils
pkgver=1.1.3
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' 'xorg-xset') # xset 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}
sha1sums=('98294cf332c341b85e481d98e9ea59357fe1efc7'
'f5c09cc10d7b88c2033392efd4179da65a1f47b1'
'32d4282c2e6c7345ddf04016c91f0defbf88b356')
#validpgpkeys=('8B75CA7811367175D05F3B03C43570F80CC295E6') # "Per Olofsson <pelle@pqz.se>"

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
}

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
}

+ 0
- 174
xdg-utils/repos/extra-any/drop_obsolete_GNOME_support.patch View File

@@ -1,175 +0,0 @@
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

+ 0
- 26
xdg-utils/trunk/0001_better_pcmanfm_check.patch View File

@@ -1,27 +0,0 @@
From 31525d3855f876ddf2e29091b2e8d376f923e09e Mon Sep 17 00:00:00 2001
From: Rex Dieter <rdieter@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



+ 0
- 50
xdg-utils/trunk/PKGBUILD View File

@@ -1,50 +0,0 @@
# $Id$
# Maintainer: Andreas Radke <andyrtr@archlinux.org>
# Maintainer: Jan de Groot <jgc@archlinux.org>

pkgname=xdg-utils
pkgver=1.1.3
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' 'xorg-xset') # xset 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}
sha1sums=('98294cf332c341b85e481d98e9ea59357fe1efc7'
'f5c09cc10d7b88c2033392efd4179da65a1f47b1'
'32d4282c2e6c7345ddf04016c91f0defbf88b356')
#validpgpkeys=('8B75CA7811367175D05F3B03C43570F80CC295E6') # "Per Olofsson <pelle@pqz.se>"

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
}

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
}

+ 0
- 174
xdg-utils/trunk/drop_obsolete_GNOME_support.patch View File

@@ -1,175 +0,0 @@
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…
Cancel
Save