| 1 |
commit: 936428d70e5d07af9a282fc99fdbd49f8526e724 |
| 2 |
Author: Dylan Wolf <etc404 <AT> protonmail <DOT> com> |
| 3 |
AuthorDate: Fri Oct 28 18:26:43 2022 +0000 |
| 4 |
Commit: Florian Schmaus <flow <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Tue Nov 1 09:59:55 2022 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=936428d7 |
| 7 |
|
| 8 |
x11-misc/nitrogen: Add myself as maintainer, add metainfo patch, and resolve #784320 |
| 9 |
|
| 10 |
Closes: https://bugs.gentoo.org/784320 |
| 11 |
Signed-off-by: Dylan Wolf <etc404 <AT> protonmail.com> |
| 12 |
Closes: https://github.com/gentoo/gentoo/pull/27629 |
| 13 |
Signed-off-by: Florian Schmaus <flow <AT> gentoo.org> |
| 14 |
|
| 15 |
...trogen-1.6.1-fix-appdata-install-location.patch | 35 ++++++++++++++++++++++ |
| 16 |
x11-misc/nitrogen/metadata.xml | 9 +++++- |
| 17 |
...en-1.6.1-r1.ebuild => nitrogen-1.6.1-r2.ebuild} | 9 ++++-- |
| 18 |
3 files changed, 50 insertions(+), 3 deletions(-) |
| 19 |
|
| 20 |
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 |
| 21 |
new file mode 100644 |
| 22 |
index 000000000000..f9a86056b4a9 |
| 23 |
--- /dev/null |
| 24 |
+++ b/x11-misc/nitrogen/files/nitrogen-1.6.1-fix-appdata-install-location.patch |
| 25 |
@@ -0,0 +1,35 @@ |
| 26 |
+From d7816bc17d03c018e532a4a1b37bd9190f7b65ef Mon Sep 17 00:00:00 2001 |
| 27 |
+From: Dylan Wolf <etc404@××××××××××.com> |
| 28 |
+Date: Wed, 12 Oct 2022 17:07:43 -0600 |
| 29 |
+Subject: [PATCH] Updated appdata installation location to |
| 30 |
+ /usr/share/metainfo/nitrogen.metainfo.xml (appdata is deprecated) |
| 31 |
+ |
| 32 |
+Signed-off-by: Dylan Wolf <etc404@××××××××××.com> |
| 33 |
+--- |
| 34 |
+ data/Makefile.am | 6 +++--- |
| 35 |
+ data/{nitrogen.appdata.xml => nitrogen.metainfo.xml} | 0 |
| 36 |
+ 2 files changed, 3 insertions(+), 3 deletions(-) |
| 37 |
+ rename data/{nitrogen.appdata.xml => nitrogen.metainfo.xml} (100%) |
| 38 |
+ |
| 39 |
+diff --git a/data/Makefile.am b/data/Makefile.am |
| 40 |
+index 7fa36c5..961b761 100644 |
| 41 |
+--- a/data/Makefile.am |
| 42 |
++++ b/data/Makefile.am |
| 43 |
+@@ -1,9 +1,9 @@ |
| 44 |
+ SUBDIRS = icons |
| 45 |
+ |
| 46 |
+-appdatadir = $(datarootdir)/appdata |
| 47 |
++metainfodir = $(datarootdir)/metainfo |
| 48 |
+ desktopdir = $(datadir)/applications |
| 49 |
+ desktop_DATA = nitrogen.desktop |
| 50 |
+-appdata_DATA = nitrogen.appdata.xml |
| 51 |
++metainfo_DATA = nitrogen.metainfo.xml |
| 52 |
+ |
| 53 |
+ UPDATE_DESKTOP = update-desktop-database $(datadir)/applications || : |
| 54 |
+ |
| 55 |
+@@ -12,5 +12,5 @@ install-data-hook: |
| 56 |
+ uninstall-hook: |
| 57 |
+ $(UPDATE_DESKTOP) |
| 58 |
+ |
| 59 |
+-EXTRA_DIST = icon-theme-installer nitrogen.appdata.xml |
| 60 |
++EXTRA_DIST = icon-theme-installer nitrogen.metainfo.xml |
| 61 |
|
| 62 |
diff --git a/x11-misc/nitrogen/metadata.xml b/x11-misc/nitrogen/metadata.xml |
| 63 |
index 85e4ed814fa2..11058dd6ade6 100644 |
| 64 |
--- a/x11-misc/nitrogen/metadata.xml |
| 65 |
+++ b/x11-misc/nitrogen/metadata.xml |
| 66 |
@@ -1,5 +1,12 @@ |
| 67 |
<?xml version="1.0" encoding="UTF-8"?> |
| 68 |
<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> |
| 69 |
<pkgmetadata> |
| 70 |
-<!-- maintainer-needed --> |
| 71 |
+ <maintainer type="person" proxied="yes"> |
| 72 |
+ <email>etc404@××××××××××.com</email> |
| 73 |
+ <name>Dylan Wolf</name> |
| 74 |
+ </maintainer> |
| 75 |
+ <maintainer type="project" proxied="proxy"> |
| 76 |
+ <email>proxy-maint@g.o</email> |
| 77 |
+ <name>Proxy Maintainers</name> |
| 78 |
+ </maintainer> |
| 79 |
</pkgmetadata> |
| 80 |
|
| 81 |
diff --git a/x11-misc/nitrogen/nitrogen-1.6.1-r1.ebuild b/x11-misc/nitrogen/nitrogen-1.6.1-r2.ebuild |
| 82 |
similarity index 82% |
| 83 |
rename from x11-misc/nitrogen/nitrogen-1.6.1-r1.ebuild |
| 84 |
rename to x11-misc/nitrogen/nitrogen-1.6.1-r2.ebuild |
| 85 |
index 2f606225b1a5..4c91440c9442 100644 |
| 86 |
--- a/x11-misc/nitrogen/nitrogen-1.6.1-r1.ebuild |
| 87 |
+++ b/x11-misc/nitrogen/nitrogen-1.6.1-r2.ebuild |
| 88 |
@@ -1,7 +1,7 @@ |
| 89 |
-# Copyright 1999-2021 Gentoo Authors |
| 90 |
+# Copyright 1999-2022 Gentoo Authors |
| 91 |
# Distributed under the terms of the GNU General Public License v2 |
| 92 |
|
| 93 |
-EAPI=7 |
| 94 |
+EAPI=8 |
| 95 |
|
| 96 |
inherit autotools flag-o-matic xdg-utils |
| 97 |
|
| 98 |
@@ -27,8 +27,13 @@ DEPEND=" |
| 99 |
xinerama? ( x11-base/xorg-proto ) |
| 100 |
" |
| 101 |
|
| 102 |
+PATCHES=( |
| 103 |
+ "${FILESDIR}/${P}-fix-appdata-install-location.patch" # https://github.com/l3ib/nitrogen/pull/156 |
| 104 |
+) |
| 105 |
+ |
| 106 |
src_prepare() { |
| 107 |
default |
| 108 |
+ mv data/nitrogen.{appdata,metainfo}.xml || die |
| 109 |
|
| 110 |
sed -i -e '/^UPDATE_DESKTOP/s#=.*#= :#g' data/Makefile.am || die |
Archives