commit: 936428d70e5d07af9a282fc99fdbd49f8526e724 Author: Dylan Wolf <etc404 <AT> protonmail <DOT> com> AuthorDate: Fri Oct 28 18:26:43 2022 +0000 Commit: Florian Schmaus <flow <AT> gentoo <DOT> org> CommitDate: Tue Nov 1 09:59:55 2022 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=936428d7
x11-misc/nitrogen: Add myself as maintainer, add metainfo patch, and resolve #784320 Closes: https://bugs.gentoo.org/784320 Signed-off-by: Dylan Wolf <etc404 <AT> protonmail.com> Closes: https://github.com/gentoo/gentoo/pull/27629 Signed-off-by: Florian Schmaus <flow <AT> gentoo.org> ...trogen-1.6.1-fix-appdata-install-location.patch | 35 ++++++++++++++++++++++ x11-misc/nitrogen/metadata.xml | 9 +++++- ...en-1.6.1-r1.ebuild => nitrogen-1.6.1-r2.ebuild} | 9 ++++-- 3 files changed, 50 insertions(+), 3 deletions(-) diff --git a/x11-misc/nitrogen/files/nitrogen-1.6.1-fix-appdata-install-location.patch b/x11-misc/nitrogen/files/nitrogen-1.6.1-fix-appdata-install-location.patch new file mode 100644 index 000000000000..f9a86056b4a9 --- /dev/null +++ b/x11-misc/nitrogen/files/nitrogen-1.6.1-fix-appdata-install-location.patch @@ -0,0 +1,35 @@ +From d7816bc17d03c018e532a4a1b37bd9190f7b65ef Mon Sep 17 00:00:00 2001 +From: Dylan Wolf <[email protected]> +Date: Wed, 12 Oct 2022 17:07:43 -0600 +Subject: [PATCH] Updated appdata installation location to + /usr/share/metainfo/nitrogen.metainfo.xml (appdata is deprecated) + +Signed-off-by: Dylan Wolf <[email protected]> +--- + data/Makefile.am | 6 +++--- + data/{nitrogen.appdata.xml => nitrogen.metainfo.xml} | 0 + 2 files changed, 3 insertions(+), 3 deletions(-) + rename data/{nitrogen.appdata.xml => nitrogen.metainfo.xml} (100%) + +diff --git a/data/Makefile.am b/data/Makefile.am +index 7fa36c5..961b761 100644 +--- a/data/Makefile.am ++++ b/data/Makefile.am +@@ -1,9 +1,9 @@ + SUBDIRS = icons + +-appdatadir = $(datarootdir)/appdata ++metainfodir = $(datarootdir)/metainfo + desktopdir = $(datadir)/applications + desktop_DATA = nitrogen.desktop +-appdata_DATA = nitrogen.appdata.xml ++metainfo_DATA = nitrogen.metainfo.xml + + UPDATE_DESKTOP = update-desktop-database $(datadir)/applications || : + +@@ -12,5 +12,5 @@ install-data-hook: + uninstall-hook: + $(UPDATE_DESKTOP) + +-EXTRA_DIST = icon-theme-installer nitrogen.appdata.xml ++EXTRA_DIST = icon-theme-installer nitrogen.metainfo.xml diff --git a/x11-misc/nitrogen/metadata.xml b/x11-misc/nitrogen/metadata.xml index 85e4ed814fa2..11058dd6ade6 100644 --- a/x11-misc/nitrogen/metadata.xml +++ b/x11-misc/nitrogen/metadata.xml @@ -1,5 +1,12 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd";> <pkgmetadata> -<!-- maintainer-needed --> + <maintainer type="person" proxied="yes"> + <email>[email protected]</email> + <name>Dylan Wolf</name> + </maintainer> + <maintainer type="project" proxied="proxy"> + <email>[email protected]</email> + <name>Proxy Maintainers</name> + </maintainer> </pkgmetadata> diff --git a/x11-misc/nitrogen/nitrogen-1.6.1-r1.ebuild b/x11-misc/nitrogen/nitrogen-1.6.1-r2.ebuild similarity index 82% rename from x11-misc/nitrogen/nitrogen-1.6.1-r1.ebuild rename to x11-misc/nitrogen/nitrogen-1.6.1-r2.ebuild index 2f606225b1a5..4c91440c9442 100644 --- a/x11-misc/nitrogen/nitrogen-1.6.1-r1.ebuild +++ b/x11-misc/nitrogen/nitrogen-1.6.1-r2.ebuild @@ -1,7 +1,7 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 inherit autotools flag-o-matic xdg-utils @@ -27,8 +27,13 @@ DEPEND=" xinerama? ( x11-base/xorg-proto ) " +PATCHES=( + "${FILESDIR}/${P}-fix-appdata-install-location.patch" # https://github.com/l3ib/nitrogen/pull/156 +) + src_prepare() { default + mv data/nitrogen.{appdata,metainfo}.xml || die sed -i -e '/^UPDATE_DESKTOP/s#=.*#= :#g' data/Makefile.am || die
