public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
From: "Sam James" <sam@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] repo/gentoo:master commit in: x11-misc/xdg-utils/files/, x11-misc/xdg-utils/
Date: Tue, 30 Jan 2024 21:37:36 +0000 (UTC)	[thread overview]
Message-ID: <1706650609.0400d10e939ff3cc16cc7810df1cfe6daf7aff11.sam@gentoo> (raw)

commit:     0400d10e939ff3cc16cc7810df1cfe6daf7aff11
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Tue Jan 30 21:36:49 2024 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Tue Jan 30 21:36:49 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0400d10e

x11-misc/xdg-utils: add 1.2.0

Signed-off-by: Sam James <sam <AT> gentoo.org>

 x11-misc/xdg-utils/Manifest                        |  1 +
 .../xdg-utils-1.2.0-xdg-icon-resource-syntax.patch | 21 +++++
 x11-misc/xdg-utils/xdg-utils-1.2.0.ebuild          | 90 ++++++++++++++++++++++
 3 files changed, 112 insertions(+)

diff --git a/x11-misc/xdg-utils/Manifest b/x11-misc/xdg-utils/Manifest
index e81a7598b77a..cce0e8371457 100644
--- a/x11-misc/xdg-utils/Manifest
+++ b/x11-misc/xdg-utils/Manifest
@@ -1,3 +1,4 @@
 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

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
new file mode 100644
index 000000000000..272daad9073e
--- /dev/null
+++ b/x11-misc/xdg-utils/files/xdg-utils-1.2.0-xdg-icon-resource-syntax.patch
@@ -0,0 +1,21 @@
+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
new file mode 100644
index 000000000000..0332fe3c66b7
--- /dev/null
+++ b/x11-misc/xdg-utils/xdg-utils-1.2.0.ebuild
@@ -0,0 +1,90 @@
+# 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."
+}


             reply	other threads:[~2024-01-30 21:37 UTC|newest]

Thread overview: 7+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2024-01-30 21:37 Sam James [this message]
  -- strict thread matches above, loose matches on Subject: below --
2024-08-29 19:03 [gentoo-commits] repo/gentoo:master commit in: x11-misc/xdg-utils/files/, x11-misc/xdg-utils/ Andreas Sturmlechner
2024-07-28 17:12 Sam James
2024-07-28  2:39 Sam James
2021-09-07 14:08 Pacho Ramos
2018-06-17 18:30 Mike Gilbert
2016-04-29  9:17 Johannes Huber

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1706650609.0400d10e939ff3cc16cc7810df1cfe6daf7aff11.sam@gentoo \
    --to=sam@gentoo.org \
    --cc=gentoo-commits@lists.gentoo.org \
    --cc=gentoo-dev@lists.gentoo.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox