From 401101f9c8077911929d3f2b60a37098460a5d89 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Thu, 24 Mar 2022 23:59:54 +0000 Subject: gentoo resync : 25.03.2022 --- dev-util/desktop-file-utils/Manifest | 2 + .../desktop-file-utils-0.26-r2.ebuild | 50 ++++++++++++ ...sktop-file-utils-0.26-support-version-1.5.patch | 88 ++++++++++++++++++++++ 3 files changed, 140 insertions(+) create mode 100644 dev-util/desktop-file-utils/desktop-file-utils-0.26-r2.ebuild create mode 100644 dev-util/desktop-file-utils/files/desktop-file-utils-0.26-support-version-1.5.patch (limited to 'dev-util/desktop-file-utils') diff --git a/dev-util/desktop-file-utils/Manifest b/dev-util/desktop-file-utils/Manifest index 86d5af7ab77f..256c57c6a196 100644 --- a/dev-util/desktop-file-utils/Manifest +++ b/dev-util/desktop-file-utils/Manifest @@ -1,4 +1,6 @@ AUX 50desktop-file-utils-gentoo.el 250 BLAKE2B 6778fd6faecc6afe376598cdab5d890364edc33f0a55983b9a1ae76bcaf78a784fae92eaa66dc24c270ecf160f747e848872fa17e9c331dce7ad2deb498492b1 SHA512 5fc03fb9c9eea7d4c19c9b263413fb4f7f247b6bd40a7452b26f7e175646dc9b3af945d25cafc42a01a8d95059324652c56baa4bb5768b62dbd58f3ae4f05fe3 +AUX desktop-file-utils-0.26-support-version-1.5.patch 2957 BLAKE2B d4f896c28719c871e32a54c8e535bf499ad2bc9e3bb5e8d294138156add9ebfc32228d79617d19f75fadbbd029a547964bf57c5a4c05a22d3aacc0898b21d6a8 SHA512 643d7e4cfe3445d929fe349d282c4fbabb1426175768e24a2ca933173d69121203f2a8c124640352370fde38d9c841aa364e5905f35c059f201d42b57cfd980e DIST desktop-file-utils-0.26.tar.xz 83132 BLAKE2B fdbe5427a0278ebe4a9b1bc15a148ecdc3f54b54058b355ae4f9a962fb1c4ec309d24a075973caf8f187a1c74b013e9bed0a7c3668bf888274e77fac9e077ec8 SHA512 5b4e435f0b635d8f898ac7f5759f74a08ffbe2a56d41fee0e84ff57e73b98d08b57b4416f20b99f696dad8bcb1c20792b39acf836b0814220c0b386ea5f6b831 EBUILD desktop-file-utils-0.26-r1.ebuild 1156 BLAKE2B 27d6d824066935cec46224abf0e2dc322c6e7a0eca12653fec7c298cdc099b062bd6fb333484484156b30f1cd0b7f76b56c8c7903904eb1a299428bf5626a889 SHA512 a0a77cbf6c9470fcec03fc235f95a96d414d5ca68ce3bd3381267d7e2ac463fc8f9683f1afae34c6ef6e757f9b85fbf57c5fe80b4a230baef4aaca39c5b8eba0 +EBUILD desktop-file-utils-0.26-r2.ebuild 1249 BLAKE2B 2d5a5624eed4d5f8fce4a1074edc109de572fc5a8afe0dc0c0888dd5d1fe63cc62c5cf38c04d661769446cf79a69b136866ec23ab57d9a45cc4820429d9f6e25 SHA512 3caa1ce39bc26f56e3484233a241acdc157c0eed3175600f8a987043d95887afd5b5f2bad06b2e91048a4be9d1a9e88bc9065fe22dd6b905fa15039a8de9e6e8 MISC metadata.xml 225 BLAKE2B 293ebc97ac40be7df2825c558f7def8026a2c8b49af06c8a5fc0dfb58657ee3093306f2a6b90bce5f7fc10f9c3165eee3cd77b58fcea8d293dacff5ba2f04657 SHA512 6f3645f7fe9f5362268973d150b122dcaef666c61e30ddc96917485c617568105aadf7b8d78bf06e402f8592c90369fdc7d949832b9fda13258b4693f1c4c6f3 diff --git a/dev-util/desktop-file-utils/desktop-file-utils-0.26-r2.ebuild b/dev-util/desktop-file-utils/desktop-file-utils-0.26-r2.ebuild new file mode 100644 index 000000000000..b564c8abb998 --- /dev/null +++ b/dev-util/desktop-file-utils/desktop-file-utils-0.26-r2.ebuild @@ -0,0 +1,50 @@ +# Copyright 1999-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 +inherit elisp-common meson + +DESCRIPTION="Command line utilities to work with desktop menu entries" +HOMEPAGE="https://freedesktop.org/wiki/Software/desktop-file-utils/" +SRC_URI="https://www.freedesktop.org/software/${PN}/releases/${P}.tar.xz" + +LICENSE="GPL-2+" +SLOT="0" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris" +IUSE="emacs" + +RDEPEND=">=dev-libs/glib-2.12:2" +DEPEND="${RDEPEND}" +BDEPEND=" + app-arch/xz-utils + virtual/pkgconfig + emacs? ( >=app-editors/emacs-23.1:* ) +" + +SITEFILE="50${PN}-gentoo.el" + +DOCS=( AUTHORS ChangeLog HACKING NEWS README ) + +# Will be in next release +PATCHES=( "${FILESDIR}/${P}-support-version-1.5.patch" ) + +src_compile() { + meson_src_compile + use emacs && elisp-compile misc/desktop-entry-mode.el +} + +src_install() { + meson_src_install + if use emacs; then + elisp-install ${PN} misc/*.el misc/*.elc || die + elisp-site-file-install "${FILESDIR}"/${SITEFILE} || die + fi +} + +pkg_postinst() { + use emacs && elisp-site-regen +} + +pkg_postrm() { + use emacs && elisp-site-regen +} diff --git a/dev-util/desktop-file-utils/files/desktop-file-utils-0.26-support-version-1.5.patch b/dev-util/desktop-file-utils/files/desktop-file-utils-0.26-support-version-1.5.patch new file mode 100644 index 000000000000..f4b57d8f2584 --- /dev/null +++ b/dev-util/desktop-file-utils/files/desktop-file-utils-0.26-support-version-1.5.patch @@ -0,0 +1,88 @@ +# Adds support for Desktop Entry Specification 1.5. Gentoo bug 795570. +# Upstream commit URLs: +# https://gitlab.freedesktop.org/xdg/desktop-file-utils/-/commit/425177a28b6215e0745f95100160a08e810fd47c +# https://gitlab.freedesktop.org/xdg/desktop-file-utils/-/commit/56d220dd679c7c3a8f995a41a27a7d6f3df49dea + +From 425177a28b6215e0745f95100160a08e810fd47c Mon Sep 17 00:00:00 2001 +From: David King +Date: Tue, 15 Feb 2022 10:54:40 +0000 +Subject: [PATCH 1/2] validate: support SingleMainWindow key from 1.5 + +Fixes https://gitlab.freedesktop.org/xdg/desktop-file-utils/-/issues/59 +--- + src/validate.c | 3 +++ + 1 file changed, 3 insertions(+) + +diff --git a/src/validate.c b/src/validate.c +index 62406ab..ebb03b5 100644 +--- a/src/validate.c ++++ b/src/validate.c +@@ -326,6 +326,9 @@ static DesktopKeyDefinition registered_desktop_keys[] = { + /* Since 1.4 */ + { DESKTOP_BOOLEAN_TYPE, "PrefersNonDefaultGPU", FALSE, FALSE, FALSE, NULL }, + ++ /* Since 1.5 */ ++ { DESKTOP_BOOLEAN_TYPE, "SingleMainWindow", FALSE, FALSE, FALSE, NULL }, ++ + /* Keys reserved for KDE */ + + /* since 0.9.4 */ +-- +GitLab + + +From 56d220dd679c7c3a8f995a41a27a7d6f3df49dea Mon Sep 17 00:00:00 2001 +From: David King +Date: Tue, 15 Feb 2022 10:56:04 +0000 +Subject: [PATCH 2/2] validate: Support version 1.5 + +Bump CURRENT_SPEC_VERSION to 1.5. +--- + man/desktop-file-validate.1 | 2 +- + src/validate.c | 3 +++ + src/validate.h | 2 +- + 3 files changed, 5 insertions(+), 2 deletions(-) + +diff --git a/man/desktop-file-validate.1 b/man/desktop-file-validate.1 +index 8e17411..ce87c47 100644 +--- a/man/desktop-file-validate.1 ++++ b/man/desktop-file-validate.1 +@@ -9,7 +9,7 @@ desktop-file-validate \- Validate desktop entry files + .B desktop-file-validate [\-\-no-hints] [\-\-no-warn-deprecated] [\-\-warn-kde] FILE... + .SH DESCRIPTION + The \fIdesktop-file-validate\fP program is a tool to validate desktop +-entry files according to the Desktop Entry specification 1.4. ++entry files according to the Desktop Entry specification 1.5. + .PP + The specification describes a file format to provide information such as + name, icon and description for an application. Such a file can then be +diff --git a/src/validate.c b/src/validate.c +index ebb03b5..f9eedee 100644 +--- a/src/validate.c ++++ b/src/validate.c +@@ -961,6 +961,9 @@ handle_version_key (kf_validator *kf, + const char *locale_key, + const char *value) + { ++ if (!strcmp (value, "1.5")) ++ return TRUE; ++ + if (!strcmp (value, "1.4")) + return TRUE; + +diff --git a/src/validate.h b/src/validate.h +index e6efd93..a7952cd 100644 +--- a/src/validate.h ++++ b/src/validate.h +@@ -30,7 +30,7 @@ + + #include + +-#define CURRENT_SPEC_VERSION "1.4" ++#define CURRENT_SPEC_VERSION "1.5" + + #define GROUP_KDE_DESKTOP_ENTRY "KDE Desktop Entry" + #define GROUP_DESKTOP_ACTION "Desktop Action " +-- +GitLab + -- cgit v1.2.3