diff options
author | V3n3RiX <venerix@redcorelinux.org> | 2018-06-23 07:00:28 +0100 |
---|---|---|
committer | V3n3RiX <venerix@redcorelinux.org> | 2018-06-23 07:00:28 +0100 |
commit | e23cdda4dbb0c83b9e682ab5e916085a35203da5 (patch) | |
tree | 5a4ac448a3b288b731c24d947e0ce52df3cab07b /x11-misc/xdg-utils | |
parent | 8187a741807f3e9a9e26304973cf18087dcf2560 (diff) |
gentoo resync : 23.06.2018
Diffstat (limited to 'x11-misc/xdg-utils')
-rw-r--r-- | x11-misc/xdg-utils/Manifest | 5 | ||||
-rw-r--r-- | x11-misc/xdg-utils/files/xdg-utils-1.1.3-xdg-open-pcmanfm.patch | 21 | ||||
-rw-r--r-- | x11-misc/xdg-utils/xdg-utils-1.1.1-r1.ebuild | 4 | ||||
-rw-r--r-- | x11-misc/xdg-utils/xdg-utils-1.1.3-r1.ebuild (renamed from x11-misc/xdg-utils/xdg-utils-1.1.3.ebuild) | 13 |
4 files changed, 32 insertions, 11 deletions
diff --git a/x11-misc/xdg-utils/Manifest b/x11-misc/xdg-utils/Manifest index a1b7a792014c..f71576378c6e 100644 --- a/x11-misc/xdg-utils/Manifest +++ b/x11-misc/xdg-utils/Manifest @@ -1,6 +1,7 @@ AUX xdg-utils-1.1.1-ktraderclient5.patch 1542 BLAKE2B 4b6adf3d181f1a7869c14d475cf156ed5952d2995243086f276aa3dace6382ba55a47cc83bf4b06da60d1363ef5fa4b815adf159b682629cb87dc4030211fae2 SHA512 a9c1def45928026cbc460527862c73e78074e924fdf088c20afeda74c64103c42f9c551123bee3e627f0d41be632c4f4d250722719a33de20c88085d1d712b4d +AUX xdg-utils-1.1.3-xdg-open-pcmanfm.patch 702 BLAKE2B 1adcb274c1a5fcca4a99178bfe38d70e5b1d1f792c20ea4de166096137d0c393a38b4958e1044aa2a6afd4437b9e4eb40d1223ea6b7dd905e93e0499a88478a3 SHA512 fd30975e48a3a7607a812bcc87d5a9595875695693609d477acbe9826a52c53b14c66a4118888eb6d8fcb63630c5f614250f4c8640d1ea99710b26714920c019 DIST xdg-utils-1.1.1.tar.gz 295213 BLAKE2B c52bf6bb4d5e2cd2848b17dc4f478debe1d9d399a02f014d0507ed26330ce47ac77c047919fabffff06c3cc773fab6bd4744bcdd9338e0726aca8e690bb76c0a SHA512 6641b17daea7eecfee0d395e621dc42481582e505bff90a6df5eb0299ed2dca7a76520f000d9545a8424f06d41590382156a2e50f3d68d5c1ab825c268e90edb DIST xdg-utils-1.1.3.tar.gz 297170 BLAKE2B bd281df73d8c966d11b502dd7ec88d96dbc9683503f54b043ae4842f146b6847bd3dd6902cf993771848d9fcb55d26d67f032af2b8aa0795a6d9855535e57d5b SHA512 d1f819a211eb4104a90dfdc6fedcb640fd46b15ccfc8762266f8f538c49d74cb00027b8c1af991fb2a200acb4379986ae375700e06a2aa08fb41a38f883acb3e -EBUILD xdg-utils-1.1.1-r1.ebuild 2222 BLAKE2B 5074042cf9a2538fb9183366831424808342ee66d5211dd1fee1a52f366d119ad78d689d748dc9642feec470ae7352c75d084e5e1e4bf325dad9eafe4372cf8e SHA512 4bacdde96a5be5a1c4265c83ac17ad0342021fb14e7e4fd2ee9009614836891bff4b14571f497fa1f8c1b39e6d2476065a44e5dda337360aa092b91a0756764f -EBUILD xdg-utils-1.1.3.ebuild 2223 BLAKE2B 9153c33784772b40796b5c35abe03dc93a7b025c812ff5fbb26636dfb70d3b227f448e8e672f187b18dd6651c7ffcf4abb7965fff576cce9f545e43f6afd0b5f SHA512 1aee4d905c11ea039569bf330d44a33889acf84e6a88688f24ac31d27e93c143b94dd5129f4cf6fe07db2c2f7c91cbfe8ec70e23131704b674462f8b161a087f +EBUILD xdg-utils-1.1.1-r1.ebuild 2181 BLAKE2B 18d2104aec42d81ff47e5ec2fe6659304217af3b36e76c8ab8212282c2cf3e75f087cc3787eeb76d4050742b59d35d12e62c99a4aecad3c17ba9f9369dc04ff3 SHA512 c6681cc7404329d3206a20188380c923ab24fdee29f917e42c55bdb3aa31a06b6711103d599f817f4c05121844c262489b2de374421796e4ba06c509d6d8c619 +EBUILD xdg-utils-1.1.3-r1.ebuild 2131 BLAKE2B 8419a25ecf2c1f5f5890930e62d952d1d4de03f48fa76663d90e7f2eeb6c0fec408757024d957b80c191ba6e98934c3f4890d3ea86273a3794973749247f5252 SHA512 27553b55394d37f83101a4bcb681c4edce7f97d74d203d197cb78122bca5a96991475d478f6480dfeedf2d3757e3f5548b5b8cad8f82b131e15d2f80b8a738f0 MISC metadata.xml 228 BLAKE2B 6b6559027915d8578c02e363cc855e812c338acf7716fe4108a8b85c09152a086cb578e7361f4613a44e8b550d7e205ff43aea39dd9488951fa18c6e15042278 SHA512 4f5e63f918a0f8790db49c5b12173c673f86935f00796a04acfed573f618379b73b05b1869941e11f881fe69d4958f5287ce815fd710eadb6ac9f2680894caae diff --git a/x11-misc/xdg-utils/files/xdg-utils-1.1.3-xdg-open-pcmanfm.patch b/x11-misc/xdg-utils/files/xdg-utils-1.1.3-xdg-open-pcmanfm.patch new file mode 100644 index 000000000000..1f6cc29ab059 --- /dev/null +++ b/x11-misc/xdg-utils/files/xdg-utils-1.1.3-xdg-open-pcmanfm.patch @@ -0,0 +1,21 @@ +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) + +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 + diff --git a/x11-misc/xdg-utils/xdg-utils-1.1.1-r1.ebuild b/x11-misc/xdg-utils/xdg-utils-1.1.1-r1.ebuild index c5e01113b9b4..af90774c45dd 100644 --- a/x11-misc/xdg-utils/xdg-utils-1.1.1-r1.ebuild +++ b/x11-misc/xdg-utils/xdg-utils-1.1.1-r1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2017 Gentoo Foundation +# Copyright 1999-2018 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 EAPI=6 @@ -15,7 +15,7 @@ SRC_URI="https://portland.freedesktop.org/download/${MY_P}.tar.gz" LICENSE="MIT" SLOT="0" -KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris" +KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x86-macos" IUSE="doc +perl" RDEPEND="dev-util/desktop-file-utils diff --git a/x11-misc/xdg-utils/xdg-utils-1.1.3.ebuild b/x11-misc/xdg-utils/xdg-utils-1.1.3-r1.ebuild index af9be47a61ba..85055ff55ce5 100644 --- a/x11-misc/xdg-utils/xdg-utils-1.1.3.ebuild +++ b/x11-misc/xdg-utils/xdg-utils-1.1.3-r1.ebuild @@ -15,7 +15,7 @@ SRC_URI="https://portland.freedesktop.org/download/${MY_P}.tar.gz" LICENSE="MIT" SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~s390 ~sparc ~x86 ~amd64-fbsd" IUSE="doc" RDEPEND=" @@ -34,6 +34,10 @@ DOCS=( README RELEASE_NOTES TODO ) # ChangeLog is bogus, see git instead RESTRICT="test" # Disabled because of sandbox violation(s) +PATCHES=( + "${FILESDIR}"/xdg-utils-1.1.3-xdg-open-pcmanfm.patch +) + #S=${WORKDIR}/${MY_P} src_prepare() { @@ -42,14 +46,9 @@ src_prepare() { # to run `autoconf` in ./ and `make scripts-clean` in ./scripts/ to refresh # all the files if [[ -d "${WORKDIR}/patch" ]]; then - eapply patch + eapply "${WORKDIR}/patch" fi eautoreconf - - if pushd scripts &>/dev/null ; then - make scripts-clean - popd &>/dev/null - fi } src_configure() { |