From 8fd9d385e5bc3c01115ec2ddcb2227607eb90861 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Fri, 5 Jan 2024 14:04:26 +0000 Subject: gentoo auto-resync : 05:01:2024 - 14:04:25 --- dev-util/desktop-file-utils/Manifest | 5 +- .../desktop-file-utils-0.26-r1.ebuild | 47 ------------ .../desktop-file-utils-0.26-r2.ebuild | 50 ------------ .../desktop-file-utils-0.27-r1.ebuild | 23 ++++++ ...sktop-file-utils-0.26-support-version-1.5.patch | 88 ---------------------- 5 files changed, 24 insertions(+), 189 deletions(-) delete mode 100644 dev-util/desktop-file-utils/desktop-file-utils-0.26-r1.ebuild delete mode 100644 dev-util/desktop-file-utils/desktop-file-utils-0.26-r2.ebuild create mode 100644 dev-util/desktop-file-utils/desktop-file-utils-0.27-r1.ebuild delete 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 481edc8533b3..62dbd84bd54b 100644 --- a/dev-util/desktop-file-utils/Manifest +++ b/dev-util/desktop-file-utils/Manifest @@ -1,8 +1,5 @@ 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 DIST desktop-file-utils-0.27.tar.xz 80808 BLAKE2B 66708cd11d5f81824cad814846cdeac6c339e8e93a7f1dceaeed545d9dc1940523fd64ae890e54632b3d32cc91b258aabd41d6d467081539f978ae2993fdfb22 SHA512 81356239a92fb17885aa85a5192c84c2757ebb2e540920d0d41d07035795f08f4162f41b1a87bb2bfcf70ec61f19f1f158e4395a359f46b46f68cb9e24f259a8 -EBUILD desktop-file-utils-0.26-r1.ebuild 1116 BLAKE2B b315c54d8cf8c185201d6b2de9b87d84930ede08f8a55eb371ff0c7255542f2a899cdc3c61d79d161e27bc996f219a8e111a60a1875f45ed5696658defa7f2e6 SHA512 080c56a20a248ba78d914ee898fa7f33a18d47daa253836b38051451388a57333376fa24f345a19d47aa719421593915237f25653cd4bb162c0a173bb9b1d7e6 -EBUILD desktop-file-utils-0.26-r2.ebuild 1221 BLAKE2B 9cbf764d8b1b8599c5a4ae2a5a9c44f14fe9ab9ce24d54ad9188d9ab79c9f7f7758a6a9c6176d52733791f0d0bf0613120e3f35d2bb01f773417859bc62f394a SHA512 e4d2f21bc6622e942c84bb476f9da3eb6340833fb72a0af0903347425aba7d10dfae9199487345430b0199e8a86228b97dba77c581b4e5398e231470586a70a9 +EBUILD desktop-file-utils-0.27-r1.ebuild 687 BLAKE2B 6e23adfa5e3d873d57df9d6ebfff52be30943439a23cb65e0ec4fd9b0158906b9992db41356710a6e761f2989105537bd4eb30f8f717c9fa7b50a01296d649f7 SHA512 c3442f46e158281c84b23a6cd6e6506eba89c52101b3b2c0743603de26da914ff30f2d5b73369c0e7d1385e65ac04c2db024c9f8e0fc7db8f4cf05a3a24ad168 EBUILD desktop-file-utils-0.27.ebuild 1138 BLAKE2B 663705e02f3db2d6ae263e7369b5486ac0ea72a1278a5194492f76abf226fba159f46014cce32e442fdce91a47fbb6010ffa10ef1d007f0c402fca80a1d33b93 SHA512 b7cfff1f16bc53f53e9ca288d617f91d7fe18b4cc38cf0bb36b4a42c7a3b8442b54505bdeac273c3e9e9a5ee7313e8da7032a0f1654d4cb9848afa5585ac328f MISC metadata.xml 225 BLAKE2B 293ebc97ac40be7df2825c558f7def8026a2c8b49af06c8a5fc0dfb58657ee3093306f2a6b90bce5f7fc10f9c3165eee3cd77b58fcea8d293dacff5ba2f04657 SHA512 6f3645f7fe9f5362268973d150b122dcaef666c61e30ddc96917485c617568105aadf7b8d78bf06e402f8592c90369fdc7d949832b9fda13258b4693f1c4c6f3 diff --git a/dev-util/desktop-file-utils/desktop-file-utils-0.26-r1.ebuild b/dev-util/desktop-file-utils/desktop-file-utils-0.26-r1.ebuild deleted file mode 100644 index 33328074b152..000000000000 --- a/dev-util/desktop-file-utils/desktop-file-utils-0.26-r1.ebuild +++ /dev/null @@ -1,47 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 -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 ~amd64-linux ~x86-linux ~x64-macos ~x64-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 ) - -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/desktop-file-utils-0.26-r2.ebuild b/dev-util/desktop-file-utils/desktop-file-utils-0.26-r2.ebuild deleted file mode 100644 index 4bbe6a30efca..000000000000 --- a/dev-util/desktop-file-utils/desktop-file-utils-0.26-r2.ebuild +++ /dev/null @@ -1,50 +0,0 @@ -# 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 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos ~x64-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/desktop-file-utils-0.27-r1.ebuild b/dev-util/desktop-file-utils/desktop-file-utils-0.27-r1.ebuild new file mode 100644 index 000000000000..4e192a93a3f6 --- /dev/null +++ b/dev-util/desktop-file-utils/desktop-file-utils-0.27-r1.ebuild @@ -0,0 +1,23 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit 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 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos ~x64-solaris" + +RDEPEND=">=dev-libs/glib-2.12:2" +DEPEND="${RDEPEND}" +BDEPEND=" + app-arch/xz-utils + virtual/pkgconfig +" + +DOCS=( AUTHORS ChangeLog HACKING NEWS README ) 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 deleted file mode 100644 index f4b57d8f2584..000000000000 --- a/dev-util/desktop-file-utils/files/desktop-file-utils-0.26-support-version-1.5.patch +++ /dev/null @@ -1,88 +0,0 @@ -# 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