* [gentoo-commits] repo/gentoo:master commit in: x11-misc/xdg-utils/, x11-misc/xdg-utils/files/
@ 2019-10-21 20:28 Pacho Ramos
0 siblings, 0 replies; 4+ messages in thread
From: Pacho Ramos @ 2019-10-21 20:28 UTC (permalink / raw
To: gentoo-commits
commit: ddfe3525c46f04a9c3b12a1a04ca42adfc529c98
Author: Pacho Ramos <pacho <AT> gentoo <DOT> org>
AuthorDate: Mon Oct 21 20:27:43 2019 +0000
Commit: Pacho Ramos <pacho <AT> gentoo <DOT> org>
CommitDate: Mon Oct 21 20:27:43 2019 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ddfe3525
x11-misc/xdg-utils: Drop old
Package-Manager: Portage-2.3.77, Repoman-2.3.17
Signed-off-by: Pacho Ramos <pacho <AT> gentoo.org>
x11-misc/xdg-utils/Manifest | 1 -
.../files/xdg-utils-1.1.1-ktraderclient5.patch | 43 -------------
x11-misc/xdg-utils/xdg-utils-1.1.1-r1.ebuild | 71 ----------------------
3 files changed, 115 deletions(-)
diff --git a/x11-misc/xdg-utils/Manifest b/x11-misc/xdg-utils/Manifest
index c480c1765e7..d1b2a495141 100644
--- a/x11-misc/xdg-utils/Manifest
+++ b/x11-misc/xdg-utils/Manifest
@@ -1,2 +1 @@
-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
diff --git a/x11-misc/xdg-utils/files/xdg-utils-1.1.1-ktraderclient5.patch b/x11-misc/xdg-utils/files/xdg-utils-1.1.1-ktraderclient5.patch
deleted file mode 100644
index eee4684c17c..00000000000
--- a/x11-misc/xdg-utils/files/xdg-utils-1.1.1-ktraderclient5.patch
+++ /dev/null
@@ -1,43 +0,0 @@
-From 31db8136bdf61e7f9cb866f9d47c99c63343558d Mon Sep 17 00:00:00 2001
-From: Massimiliano Torromeo <massimiliano.torromeo@gmail.com>
-Date: Fri, 15 Apr 2016 11:17:37 +0200
-Subject: xdg-mime: support for KDE Frameworks 5.6
-
-
-diff --git a/scripts/xdg-mime.in b/scripts/xdg-mime.in
-index 129850f..63b8a82 100644
---- a/scripts/xdg-mime.in
-+++ b/scripts/xdg-mime.in
-@@ -428,13 +428,9 @@ defapp_kde()
- case "${KDE_SESSION_VERSION}" in
- 4)
- KTRADER=`which ktraderclient 2> /dev/null`
-- MIMETYPE="--mimetype"
-- SERVICETYPE="--servicetype"
- ;;
- 5)
- KTRADER=`which ktraderclient${KDE_SESSION_VERSION} 2> /dev/null`
-- MIMETYPE="--mimetype"
-- SERVICETYPE="--servicetype"
- ;;
- esac
- else
-@@ -442,8 +438,8 @@ defapp_kde()
- fi
- if [ -n "$KTRADER" ] ; then
- DEBUG 1 "Running KDE trader query \"$MIME\" mimetype and \"Application\" servicetype"
-- trader_result=`$KTRADER $MIMETYPE "$MIME" $SERVICETYPE Application 2>/dev/null \
-- | grep DesktopEntryPath | head -n 1 | cut -d ':' -f 2 | cut -d \' -f 2`
-+ trader_result=`$KTRADER --mimetype "$MIME" --servicetype Application 2>/dev/null \
-+ | grep -E "^DesktopEntryPath : |\.desktop$" | head -n1 | sed "s/^DesktopEntryPath : '\(.*\.desktop\)'\$/\1/"`
- if [ -n "$trader_result" ] ; then
- basename "$trader_result"
- exit_success
-@@ -954,4 +950,3 @@ esac
- update_mime_database $xdg_base_dir
-
- exit_success
--
---
-cgit v0.10.2
-
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
deleted file mode 100644
index ddf9215344f..00000000000
--- a/x11-misc/xdg-utils/xdg-utils-1.1.1-r1.ebuild
+++ /dev/null
@@ -1,71 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit autotools
-
-MY_P=${P/_/-}
-
-DESCRIPTION="Portland utils for cross-platform/cross-toolkit/cross-desktop interoperability"
-HOMEPAGE="https://www.freedesktop.org/wiki/Software/xdg-utils/"
-#SRC_URI="https://dev.gentoo.org/~johu/distfiles/${P}.tar.xz"
-#SRC_URI="https://people.freedesktop.org/~rdieter/${PN}/${MY_P}.tar.gz
-# https://dev.gentoo.org/~ssuominen/${P}-patchset-1.tar.xz"
-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-linux ~x86-linux ~x86-macos"
-IUSE="doc +perl"
-
-RDEPEND="dev-util/desktop-file-utils
- x11-misc/shared-mime-info
- x11-apps/xprop
- x11-apps/xset
- perl? ( dev-perl/File-MimeInfo )"
-DEPEND=">=app-text/xmlto-0.0.26-r1[text(+)]"
-
-DOCS=( README RELEASE_NOTES TODO ) # ChangeLog is bogus, see git instead
-
-PATCHES=( "${FILESDIR}/${P}-ktraderclient5.patch" )
-
-RESTRICT="test" # Disabled because of sandbox violation(s)
-
-#S=${WORKDIR}/${MY_P}
-
-src_prepare() {
- default
- # If you choose to do git snapshot instead of patchset, you need to remember
- # to run `autoconf` in ./ and `make scripts-clean` in ./scripts/ to refresh
- # all the files
- if [[ -d ${WORKDIR}/patch ]]; then
- EPATCH_SUFFIX=patch EPATCH_FORCE=yes epatch
- fi
- eautoreconf
- pushd scripts && make scripts-clean && popd
-}
-
-src_configure() {
- export ac_cv_path_XMLTO="$(type -P xmlto) --skip-validation" #502166
- default
-}
-
-src_install() {
- default
-
- newdoc scripts/xsl/README README.xsl
- use doc && dodoc -r scripts/html
-
- # Install default XDG_DATA_DIRS, bug #264647
- echo XDG_DATA_DIRS=\"${EPREFIX}/usr/local/share\" > 30xdg-data-local
- echo 'COLON_SEPARATED="XDG_DATA_DIRS XDG_CONFIG_DIRS"' >> 30xdg-data-local
- doenvd 30xdg-data-local
-
- echo XDG_DATA_DIRS=\"${EPREFIX}/usr/share\" > 90xdg-data-base
- echo XDG_CONFIG_DIRS=\"${EPREFIX}/etc/xdg\" >> 90xdg-data-base
- doenvd 90xdg-data-base
-}
-
-pkg_postinst() {
- [[ -x $(type -P gtk-update-icon-cache) ]] || elog "Install dev-util/gtk-update-icon-cache for the gtk-update-icon-cache command."
-}
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: x11-misc/xdg-utils/, x11-misc/xdg-utils/files/
@ 2022-12-04 14:50 Pacho Ramos
0 siblings, 0 replies; 4+ messages in thread
From: Pacho Ramos @ 2022-12-04 14:50 UTC (permalink / raw
To: gentoo-commits
commit: 26c9331be2f01733984f7f46720bd517772df369
Author: Pacho Ramos <pacho <AT> gentoo <DOT> org>
AuthorDate: Sun Dec 4 14:41:16 2022 +0000
Commit: Pacho Ramos <pacho <AT> gentoo <DOT> org>
CommitDate: Sun Dec 4 14:49:22 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=26c9331b
x11-misc/xdg-utils: Don't use egrep
Closes: https://bugs.gentoo.org/883589
Thanks-to: Hanno Böck
Signed-off-by: Pacho Ramos <pacho <AT> gentoo.org>
x11-misc/xdg-utils/files/xdg-utils-egrep.patch | 25 +++++++
.../xdg-utils/xdg-utils-1.1.3_p20210805-r1.ebuild | 87 ++++++++++++++++++++++
2 files changed, 112 insertions(+)
diff --git a/x11-misc/xdg-utils/files/xdg-utils-egrep.patch b/x11-misc/xdg-utils/files/xdg-utils-egrep.patch
new file mode 100644
index 000000000000..71608552a08b
--- /dev/null
+++ b/x11-misc/xdg-utils/files/xdg-utils-egrep.patch
@@ -0,0 +1,25 @@
+From 7538458c6c8999296a272c40bd4ec24132a51877 Mon Sep 17 00:00:00 2001
+From: E5ten <ethancsommer@gmail.com>
+Date: Thu, 16 Jan 2020 02:06:09 +0000
+Subject: [PATCH] switch from non-standard "egrep" to POSIX "grep -E"
+
+---
+ scripts/xdg-open.in | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/scripts/xdg-open.in b/scripts/xdg-open.in
+index 202f3e3..35b0522 100644
+--- a/scripts/xdg-open.in
++++ b/scripts/xdg-open.in
+@@ -72,7 +72,7 @@ get_key()
+ is_file_url_or_path()
+ {
+ if echo "$1" | grep -q '^file://' \
+- || ! echo "$1" | egrep -q '^[[:alpha:]][[:alpha:][:digit:]+\.\-]*:'; then
++ || ! echo "$1" | grep -Eq '^[[:alpha:]][[:alpha:][:digit:]+\.\-]*:'; then
+ return 0
+ else
+ return 1
+--
+GitLab
+
diff --git a/x11-misc/xdg-utils/xdg-utils-1.1.3_p20210805-r1.ebuild b/x11-misc/xdg-utils/xdg-utils-1.1.3_p20210805-r1.ebuild
new file mode 100644
index 000000000000..7aec38025c3e
--- /dev/null
+++ b/x11-misc/xdg-utils/xdg-utils-1.1.3_p20210805-r1.ebuild
@@ -0,0 +1,87 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit autotools
+
+MY_COMMIT="1a58bc28f6844898532daf9ee1bf6da7764955a9"
+DESCRIPTION="Portland utils for cross-platform/cross-toolkit/cross-desktop interoperability"
+HOMEPAGE="https://www.freedesktop.org/wiki/Software/xdg-utils/"
+SRC_URI="https://gitlab.freedesktop.org/xdg/xdg-utils/-/archive/${MY_COMMIT}/${P}.tar.bz2"
+# https://gitlab.freedesktop.org/xdg/xdg-utils/-/merge_requests/24
+SRC_URI+=" https://dev.gentoo.org/~sam/distfiles/${CATEGORY}/${PN}/${PN}-1.1.3_p20200220-no-which.patch.xz"
+S="${WORKDIR}"/xdg-utils-${MY_COMMIT}
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
+IUSE="dbus doc gnome"
+REQUIRED_USE="gnome? ( dbus )"
+
+RDEPEND="
+ dev-util/desktop-file-utils
+ dev-perl/File-MimeInfo
+ dbus? (
+ sys-apps/dbus
+ gnome? (
+ dev-perl/Net-DBus
+ dev-perl/X11-Protocol
+ )
+ )
+ x11-misc/shared-mime-info
+ x11-apps/xprop
+ x11-apps/xset
+"
+BDEPEND="
+ >=app-text/xmlto-0.0.28-r3[text(+)]
+ app-alternatives/awk
+"
+
+DOCS=( ChangeLog README RELEASE_NOTES TODO )
+
+# Tests run random system programs, including interactive programs
+# that block forever
+RESTRICT="test"
+
+PATCHES=(
+ "${WORKDIR}"/${PN}-1.1.3_p20200220-no-which.patch
+ # https://gitlab.freedesktop.org/xdg/xdg-utils/-/merge_requests/21
+ "${FILESDIR}"/${PN}-egrep.patch
+)
+
+src_prepare() {
+ default
+
+ # If you choose to do git snapshot instead of patchset, you need to remember
+ # to run `autoconf` in ./ and `make scripts-clean` in ./scripts/ to refresh
+ # all the files
+ eautoreconf
+}
+
+src_configure() {
+ export ac_cv_path_XMLTO="$(type -P xmlto) --skip-validation" #502166
+ default
+ emake -C scripts scripts-clean
+}
+
+src_install() {
+ default
+
+ newdoc scripts/xsl/README README.xsl
+ use doc && dodoc -r scripts/html
+
+ # Install default XDG_DATA_DIRS, bug #264647
+ echo XDG_DATA_DIRS=\"${EPREFIX}/usr/local/share\" > 30xdg-data-local
+ echo 'COLON_SEPARATED="XDG_DATA_DIRS XDG_CONFIG_DIRS"' >> 30xdg-data-local
+ doenvd 30xdg-data-local
+
+ echo XDG_DATA_DIRS=\"${EPREFIX}/usr/share\" > 90xdg-data-base
+ echo XDG_CONFIG_DIRS=\"${EPREFIX}/etc/xdg\" >> 90xdg-data-base
+ doenvd 90xdg-data-base
+}
+
+pkg_postinst() {
+ [[ -x $(type -P gtk-update-icon-cache) ]] \
+ || elog "Install dev-util/gtk-update-icon-cache for the gtk-update-icon-cache command."
+}
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: x11-misc/xdg-utils/, x11-misc/xdg-utils/files/
@ 2024-02-06 2:27 Sam James
0 siblings, 0 replies; 4+ messages in thread
From: Sam James @ 2024-02-06 2:27 UTC (permalink / raw
To: gentoo-commits
commit: d93c976e2edb91ef8a1524b81a224ae99e1cb036
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Tue Feb 6 02:26:41 2024 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Tue Feb 6 02:26:41 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d93c976e
x11-misc/xdg-utils: drop 1.2.0_beta1_p20231203, 1.2.0
1.2.1 is very similar, just use that.
Signed-off-by: Sam James <sam <AT> gentoo.org>
x11-misc/xdg-utils/Manifest | 2 -
.../xdg-utils-1.2.0-xdg-icon-resource-syntax.patch | 21 -----
x11-misc/xdg-utils/xdg-utils-1.2.0.ebuild | 90 ----------------------
.../xdg-utils-1.2.0_beta1_p20231203.ebuild | 81 -------------------
4 files changed, 194 deletions(-)
diff --git a/x11-misc/xdg-utils/Manifest b/x11-misc/xdg-utils/Manifest
index 12b264770be3..fcc0588cf220 100644
--- a/x11-misc/xdg-utils/Manifest
+++ b/x11-misc/xdg-utils/Manifest
@@ -1,5 +1,3 @@
DIST xdg-utils-1.1.3_p20200220-no-which.patch.xz 5576 BLAKE2B cf8c3111689c355add2a0c16a887fd463dc2d00c267cac0561d4598430f043d19fea376859aa4ff521273ff788b4e8afdea5ef6e7b0ba51ffded23be2ad61335 SHA512 c30e512e8caae3f4d2282592722bc24e08cb33f5ec01d5504d2e49833c1598fe27807c095dc2226efca57dcbef4d2883fd9bfa46fb8eeee93c53f9880c050b51
DIST xdg-utils-1.1.3_p20210805.tar.bz2 287544 BLAKE2B ec3755e5e6f596c5787324ab254ba14938f35dda6df5a4ef88fb582c5df7704e706dee2f4362cc0597164cf2aeab5cf8f5f6db1b9d374355723e3d738e101264 SHA512 ec51e98e4c73ad7cb3c77051617a939c7956c7da6bcbbcda4e54121af247ce6978c8638c80bc644a49cfca14b18f06cb25747719bc20c97f7e60b9b4f3597a71
-DIST xdg-utils-1.2.0_beta1_p20231203.tar.bz2 291213 BLAKE2B 65004e451f002175a1dd5c142f9be312e66b16917ea61e3e8a907c92c99aa7e8a0111951ef075830ac2b2a09e809778a91770c6021edd82174ff4eef2a72fca1 SHA512 a19750fa9b18dbad434134e7b336c622419a9e272d310e10cd711fca592ecd5b6ee4fe648222108ada463c18c103310d92b4ca209057ee0372414e9041f489de
-DIST xdg-utils-v1.2.0.tar.bz2 293400 BLAKE2B 896678febecbb8dff8d272d0901b28692406fa11d97ab0c43c45d2097f18d95a38c44f4eacd7ce2b9e14bb52835009755d50232904958b57d260e8f9d84ce020 SHA512 6562d728c0eac50a650ed5917eab83259f340691d7e7b94e4a6c58f3068fd1b62cfabc38efd3e39a246001c689d2cb2f001cef93af8281e868a20a49282daf91
DIST xdg-utils-v1.2.1.tar.bz2 293386 BLAKE2B 9d6ce4be8c27ad5b8d0ae55ad0d8b4457b59cb1bd260884ca5bfd2cb8ed7ed68a2f5a8db6d660ceabab59cbb9880fd4f1a26cb71a8f759ec40c2f9f95bbc8a05 SHA512 d5436449fec2f4db952239ee910bfda203955c8df8cb92379f182dc36f9c82b6ceb092ccbebfd02ed00eb7ef5f6895ef745baca67906ae7490e425db27b1dbfc
diff --git a/x11-misc/xdg-utils/files/xdg-utils-1.2.0-xdg-icon-resource-syntax.patch b/x11-misc/xdg-utils/files/xdg-utils-1.2.0-xdg-icon-resource-syntax.patch
deleted file mode 100644
index 272daad9073e..000000000000
--- a/x11-misc/xdg-utils/files/xdg-utils-1.2.0-xdg-icon-resource-syntax.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-https://gitlab.freedesktop.org/xdg/xdg-utils/-/commit/af2fe0d1dcbcd982d84ddf2bbd174afe90976ed9
-
-From af2fe0d1dcbcd982d84ddf2bbd174afe90976ed9 Mon Sep 17 00:00:00 2001
-From: Harald Sitter <sitter@kde.org>
-Date: Tue, 30 Jan 2024 11:24:41 +0100
-Subject: [PATCH] xdg-icon-resource: unbreak syntax by removing stray grave
- accent
-
---- a/scripts/xdg-icon-resource.in
-+++ b/scripts/xdg-icon-resource.in
-@@ -306,7 +306,7 @@ fi
- need_kde_icon_path()
- {
- local path
-- path="$(xdg_realpath "$1")" 2> /dev/null` # Normalize path
-+ path="$(xdg_realpath "$1")" 2> /dev/null # Normalize path
- DEBUG 2 "need_kde_icon_path $path"
- if [ -z "$path" ] ; then
- DEBUG 2 "need_kde_icon_path RETURN 1 (not needed, no xdg icon dir)"
---
-GitLab
diff --git a/x11-misc/xdg-utils/xdg-utils-1.2.0.ebuild b/x11-misc/xdg-utils/xdg-utils-1.2.0.ebuild
deleted file mode 100644
index 0332fe3c66b7..000000000000
--- a/x11-misc/xdg-utils/xdg-utils-1.2.0.ebuild
+++ /dev/null
@@ -1,90 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit autotools
-
-DESCRIPTION="Portland utils for cross-platform/cross-toolkit/cross-desktop interoperability"
-HOMEPAGE="https://www.freedesktop.org/wiki/Software/xdg-utils/"
-if [[ ${PV} == *_p* ]] ; then
- MY_COMMIT="d4f00e1d803038af4f245949d8c747a384117852"
- SRC_URI="https://gitlab.freedesktop.org/xdg/xdg-utils/-/archive/${MY_COMMIT}/${P}.tar.bz2"
- S="${WORKDIR}"/xdg-utils-${MY_COMMIT}
-else
- SRC_URI="https://gitlab.freedesktop.org/xdg/xdg-utils/-/archive/v${PV}/${PN}-v${PV}.tar.bz2"
- S="${WORKDIR}"/${PN}-v${PV}
-fi
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
-IUSE="dbus doc gnome"
-REQUIRED_USE="gnome? ( dbus )"
-
-RDEPEND="
- dev-util/desktop-file-utils
- dev-perl/File-MimeInfo
- dbus? (
- sys-apps/dbus
- gnome? (
- dev-perl/Net-DBus
- dev-perl/X11-Protocol
- )
- )
- x11-misc/shared-mime-info
- x11-apps/xprop
- x11-apps/xset
-"
-BDEPEND="
- >=app-text/xmlto-0.0.28-r3[text(+)]
- app-alternatives/awk
-"
-
-# Tests run random system programs, including interactive programs
-# that block forever
-RESTRICT="test"
-
-PATCHES=(
- "${FILESDIR}"/${P}-xdg-icon-resource-syntax.patch
-)
-
-src_prepare() {
- default
-
- if [[ ${PV} == *_p* ]] ; then
- # If you choose to do git snapshot instead of patchset, you need to remember
- # to run `autoconf` in ./ and `make scripts-clean` in ./scripts/ to refresh
- # all the files
- eautoreconf
- fi
-}
-
-src_configure() {
- export ac_cv_path_XMLTO="$(type -P xmlto) --skip-validation" #502166
- default
- emake -C scripts scripts-clean
-}
-
-src_install() {
- default
-
- dodoc RELEASE_NOTES
-
- newdoc scripts/xsl/README README.xsl
- use doc && dodoc -r scripts/html
-
- # Install default XDG_DATA_DIRS, bug #264647
- echo XDG_DATA_DIRS=\"${EPREFIX}/usr/local/share\" > 30xdg-data-local || die
- echo 'COLON_SEPARATED="XDG_DATA_DIRS XDG_CONFIG_DIRS"' >> 30xdg-data-local || die
- doenvd 30xdg-data-local
-
- echo XDG_DATA_DIRS=\"${EPREFIX}/usr/share\" > 90xdg-data-base || die
- echo XDG_CONFIG_DIRS=\"${EPREFIX}/etc/xdg\" >> 90xdg-data-base || die
- doenvd 90xdg-data-base
-}
-
-pkg_postinst() {
- [[ -x $(type -P gtk-update-icon-cache) ]] \
- || elog "Install dev-util/gtk-update-icon-cache for the gtk-update-icon-cache command."
-}
diff --git a/x11-misc/xdg-utils/xdg-utils-1.2.0_beta1_p20231203.ebuild b/x11-misc/xdg-utils/xdg-utils-1.2.0_beta1_p20231203.ebuild
deleted file mode 100644
index 2e2d0e72ceea..000000000000
--- a/x11-misc/xdg-utils/xdg-utils-1.2.0_beta1_p20231203.ebuild
+++ /dev/null
@@ -1,81 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit autotools
-
-MY_COMMIT="d4f00e1d803038af4f245949d8c747a384117852"
-DESCRIPTION="Portland utils for cross-platform/cross-toolkit/cross-desktop interoperability"
-HOMEPAGE="https://www.freedesktop.org/wiki/Software/xdg-utils/"
-SRC_URI="https://gitlab.freedesktop.org/xdg/xdg-utils/-/archive/${MY_COMMIT}/${P}.tar.bz2"
-S="${WORKDIR}"/xdg-utils-${MY_COMMIT}
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
-IUSE="dbus doc gnome"
-REQUIRED_USE="gnome? ( dbus )"
-
-RDEPEND="
- dev-util/desktop-file-utils
- dev-perl/File-MimeInfo
- dbus? (
- sys-apps/dbus
- gnome? (
- dev-perl/Net-DBus
- dev-perl/X11-Protocol
- )
- )
- x11-misc/shared-mime-info
- x11-apps/xprop
- x11-apps/xset
-"
-BDEPEND="
- >=app-text/xmlto-0.0.28-r3[text(+)]
- app-alternatives/awk
-"
-
-# Tests run random system programs, including interactive programs
-# that block forever
-RESTRICT="test"
-
-src_prepare() {
- default
-
- if [[ ${PV} == *_p* ]] ; then
- # If you choose to do git snapshot instead of patchset, you need to remember
- # to run `autoconf` in ./ and `make scripts-clean` in ./scripts/ to refresh
- # all the files
- eautoreconf
- fi
-}
-
-src_configure() {
- export ac_cv_path_XMLTO="$(type -P xmlto) --skip-validation" #502166
- default
- emake -C scripts scripts-clean
-}
-
-src_install() {
- default
-
- dodoc RELEASE_NOTES
-
- newdoc scripts/xsl/README README.xsl
- use doc && dodoc -r scripts/html
-
- # Install default XDG_DATA_DIRS, bug #264647
- echo XDG_DATA_DIRS=\"${EPREFIX}/usr/local/share\" > 30xdg-data-local || die
- echo 'COLON_SEPARATED="XDG_DATA_DIRS XDG_CONFIG_DIRS"' >> 30xdg-data-local || die
- doenvd 30xdg-data-local
-
- echo XDG_DATA_DIRS=\"${EPREFIX}/usr/share\" > 90xdg-data-base || die
- echo XDG_CONFIG_DIRS=\"${EPREFIX}/etc/xdg\" >> 90xdg-data-base || die
- doenvd 90xdg-data-base
-}
-
-pkg_postinst() {
- [[ -x $(type -P gtk-update-icon-cache) ]] \
- || elog "Install dev-util/gtk-update-icon-cache for the gtk-update-icon-cache command."
-}
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: x11-misc/xdg-utils/, x11-misc/xdg-utils/files/
@ 2024-06-01 3:31 Sam James
0 siblings, 0 replies; 4+ messages in thread
From: Sam James @ 2024-06-01 3:31 UTC (permalink / raw
To: gentoo-commits
commit: 43a36b89fbd4f4a108e70381e80c6e261256f407
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Sat Jun 1 03:11:41 2024 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sat Jun 1 03:11:41 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=43a36b89
x11-misc/xdg-utils: fix xdg-mime default regression
Closes: https://bugs.gentoo.org/931673
Signed-off-by: Sam James <sam <AT> gentoo.org>
.../files/xdg-utils-1.2.1-xdg-mime-default.patch | 143 +++++++++++++++++++++
x11-misc/xdg-utils/xdg-utils-1.2.1-r2.ebuild | 92 +++++++++++++
2 files changed, 235 insertions(+)
diff --git a/x11-misc/xdg-utils/files/xdg-utils-1.2.1-xdg-mime-default.patch b/x11-misc/xdg-utils/files/xdg-utils-1.2.1-xdg-mime-default.patch
new file mode 100644
index 000000000000..8efcdca1cfef
--- /dev/null
+++ b/x11-misc/xdg-utils/files/xdg-utils-1.2.1-xdg-mime-default.patch
@@ -0,0 +1,143 @@
+https://gitlab.freedesktop.org/xdg/xdg-utils/-/issues/252
+https://gitlab.freedesktop.org/xdg/xdg-utils/-/commit/f113a8b997dcb9527b9694d31bddcfa05096aecf
+
+From f113a8b997dcb9527b9694d31bddcfa05096aecf Mon Sep 17 00:00:00 2001
+From: Slatian <baschdel@disroot.org>
+Date: Tue, 21 May 2024 04:08:23 +0000
+Subject: [PATCH] Make the desktop_file_to_binary function less likely to fall
+ over and do something unexpected.
+
+* Uses a shell implementation ( !24) of `which` in the `desktop_file_to_binary` to avoid tripping over unexpected output from `command -v`
+* In addition it also makes the parsing a bit more standards compliant than it previously was.
+* Adds a developer script to easier test internal functions in the xdg-utils-common.in file
+
+Fixes: #252
+---
+ scripts/test-common-function | 13 ++++++++
+ scripts/xdg-utils-common.in | 64 +++++++++++++++++++++++++++++++-----
+ 2 files changed, 68 insertions(+), 9 deletions(-)
+ create mode 100755 scripts/test-common-function
+
+diff --git a/scripts/test-common-function b/scripts/test-common-function
+new file mode 100755
+index 0000000..c8af98d
+--- /dev/null
++++ b/scripts/test-common-function
+@@ -0,0 +1,13 @@
++#!/bin/sh
++
++# This script is for testing internal functions of the xdg-utils-common.in file
++#
++# Example ./test-common-function xdg_which echo
++
++XDG_UTILS_DEBUG_LEVEL="${XDG_UTILS_DEBUG_LEVEL:-99}"
++
++. ./xdg-utils-common.in
++
++"$@"
++
++exit $?
+diff --git a/scripts/xdg-utils-common.in b/scripts/xdg-utils-common.in
+index f0a1aac..adab368 100644
+--- a/scripts/xdg-utils-common.in
++++ b/scripts/xdg-utils-common.in
+@@ -51,19 +51,24 @@ binary_to_desktop_file()
+ }
+
+ #-------------------------------------------------------------
+-# map a .desktop file to a binary
++# map a .desktop file name to its Exec binary
++# Returns the realpath resolved path to the binary or noting.
++
++# desktop_file_to_binary <desktop-file-name>
+ desktop_file_to_binary()
+ {
++ DEBUG 1 "desktop_file_to_binary '$1'"
+ search="${XDG_DATA_HOME:-$HOME/.local/share}:${XDG_DATA_DIRS:-/usr/local/share:/usr/share}"
+ desktop="$(basename "$1")"
+ IFS=:
+ for dir in $search; do
++ DEBUG 2 "Searching in '$dir/{applications,applnk}'"
+ unset IFS
+- [ "$dir" ] && [ -d "$dir/applications" ] || [ -d "$dir/applnk" ] || continue
++ [ -n "$dir" ] && [ -d "$dir/applications" ] || [ -d "$dir/applnk" ] || continue
+ # Check if desktop file contains -
+ if [ "${desktop#*-}" != "$desktop" ]; then
+- vendor=${desktop%-*}
+- app=${desktop#*-}
++ vendor="${desktop%-*}"
++ app="${desktop#*-}"
+ if [ -r "$dir/applications/$vendor/$app" ]; then
+ file_path="$dir/applications/$vendor/$app"
+ elif [ -r "$dir/applnk/$vendor/$app" ]; then
+@@ -72,18 +77,31 @@ desktop_file_to_binary()
+ fi
+ if test -z "$file_path" ; then
+ for indir in "$dir"/applications/ "$dir"/applications/*/ "$dir"/applnk/ "$dir"/applnk/*/; do
++ DEBUG 4 "Does file exist? '$indir/$desktop'"
+ file="$indir/$desktop"
+ if [ -r "$file" ]; then
+- file_path=$file
++ file_path="$file"
+ break
+ fi
+ done
+ fi
+ if [ -r "$file_path" ]; then
+- # Remove any arguments (%F, %f, %U, %u, etc.).
+- command="$(grep -E "^Exec(\[[^]=]*])?=" "$file_path" | cut -d= -f 2- | first_word)"
+- command="$(command -v "$command")"
+- xdg_realpath "$command"
++ DEBUG 2 "Checking desktop file '$file_path'"
++ # Get the command name from the correct Exec
++ # Note: Ignoring quoting and escape sequences here, see #253
++ binary="$(awk -F '=' '
++ /^\[/{ in_entry=0 }
++ $0 == "[Desktop Entry]"{ in_entry=1 }
++ in_entry && /^Exec\s*=/ {
++ sub(/^\s+/,"",$2);
++ match($2,/^[^ ]+/);
++ print substr($2,RSTART,RLENGTH)
++ }' \
++ < "$file_path" )"
++ DEBUG 2 "Found command: $binary"
++ binary="$(xdg_which "$binary")"
++ DEBUG 2 "Resolved to command to file: '$binary'"
++ [ -z "$binary" ] || xdg_realpath "$binary"
+ return
+ fi
+ done
+@@ -461,3 +479,31 @@ xdg_realpath()
+ ;;
+ esac
+ }
++
++#----------------------------------------------------------------------------
++# The `which` command but as a shell implementation.
++# Returns either the path of the resolved binary or nothing
++# because command -v does not always return the path of a command
++# (builtins, aliases, functions, etc.)
++
++# xdg_which <command>
++xdg_which()
++{
++ if [ -z "$1" ] ; then
++ return 1
++ elif [ -x "$1" ] ; then
++ printf "%s\n" "$1"
++ else
++ # this should be faster than the real thing because of shell builtins
++ old_ifs="$IFS"
++ IFS=:
++ for p in $PATH ; do
++ IFS="$old_ifs"
++ if [ -x "$p/$1" ] ; then
++ printf "%s\n" "$p/$1"
++ return
++ fi
++ done
++ return 1
++ fi
++}
+--
+GitLab
diff --git a/x11-misc/xdg-utils/xdg-utils-1.2.1-r2.ebuild b/x11-misc/xdg-utils/xdg-utils-1.2.1-r2.ebuild
new file mode 100644
index 000000000000..3f66355e2cb9
--- /dev/null
+++ b/x11-misc/xdg-utils/xdg-utils-1.2.1-r2.ebuild
@@ -0,0 +1,92 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit autotools
+
+DESCRIPTION="Portland utils for cross-platform/cross-toolkit/cross-desktop interoperability"
+HOMEPAGE="https://www.freedesktop.org/wiki/Software/xdg-utils/"
+if [[ ${PV} == *_p* ]] ; then
+ MY_COMMIT="d4f00e1d803038af4f245949d8c747a384117852"
+ SRC_URI="https://gitlab.freedesktop.org/xdg/xdg-utils/-/archive/${MY_COMMIT}/${P}.tar.bz2"
+ S="${WORKDIR}"/xdg-utils-${MY_COMMIT}
+else
+ SRC_URI="https://gitlab.freedesktop.org/xdg/xdg-utils/-/archive/v${PV}/${PN}-v${PV}.tar.bz2"
+ S="${WORKDIR}"/${PN}-v${PV}
+fi
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
+IUSE="dbus doc gnome X"
+REQUIRED_USE="gnome? ( dbus )"
+
+RDEPEND="
+ dev-util/desktop-file-utils
+ dev-perl/File-MimeInfo
+ dbus? (
+ sys-apps/dbus
+ gnome? (
+ dev-perl/Net-DBus
+ dev-perl/X11-Protocol
+ )
+ )
+ x11-misc/shared-mime-info
+ X? (
+ x11-apps/xprop
+ x11-apps/xset
+ )
+"
+BDEPEND="
+ >=app-text/xmlto-0.0.28-r3[text(+)]
+ app-alternatives/awk
+"
+
+# Tests run random system programs, including interactive programs
+# that block forever
+RESTRICT="test"
+
+PATCHES=(
+ "${FILESDIR}"/${P}-xdg-mime-default.patch
+)
+
+src_prepare() {
+ default
+
+ if [[ ${PV} == *_p* ]] ; then
+ # If you choose to do git snapshot instead of patchset, you need to remember
+ # to run `autoconf` in ./ and `make scripts-clean` in ./scripts/ to refresh
+ # all the files
+ eautoreconf
+ fi
+}
+
+src_configure() {
+ export ac_cv_path_XMLTO="$(type -P xmlto) --skip-validation" #502166
+ default
+ emake -C scripts scripts-clean
+}
+
+src_install() {
+ default
+
+ dodoc RELEASE_NOTES
+
+ newdoc scripts/xsl/README README.xsl
+ use doc && dodoc -r scripts/html
+
+ # Install default XDG_DATA_DIRS, bug #264647
+ echo XDG_DATA_DIRS=\"${EPREFIX}/usr/local/share\" > 30xdg-data-local || die
+ echo 'COLON_SEPARATED="XDG_DATA_DIRS XDG_CONFIG_DIRS"' >> 30xdg-data-local || die
+ doenvd 30xdg-data-local
+
+ echo XDG_DATA_DIRS=\"${EPREFIX}/usr/share\" > 90xdg-data-base || die
+ echo XDG_CONFIG_DIRS=\"${EPREFIX}/etc/xdg\" >> 90xdg-data-base || die
+ doenvd 90xdg-data-base
+}
+
+pkg_postinst() {
+ [[ -x $(type -P gtk-update-icon-cache) ]] \
+ || elog "Install dev-util/gtk-update-icon-cache for the gtk-update-icon-cache command."
+}
^ permalink raw reply related [flat|nested] 4+ messages in thread
end of thread, other threads:[~2024-06-01 3:31 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2024-06-01 3:31 [gentoo-commits] repo/gentoo:master commit in: x11-misc/xdg-utils/, x11-misc/xdg-utils/files/ Sam James
-- strict thread matches above, loose matches on Subject: below --
2024-02-06 2:27 Sam James
2022-12-04 14:50 Pacho Ramos
2019-10-21 20:28 Pacho Ramos
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox