summaryrefslogtreecommitdiff
path: root/x11-misc
diff options
context:
space:
mode:
authorV3n3RiX <venerix@koprulu.sector>2022-11-01 15:07:30 +0000
committerV3n3RiX <venerix@koprulu.sector>2022-11-01 15:07:30 +0000
commitdb16929598ac333b179fdfead630dbdfa68840a5 (patch)
tree781f3bac8b151e4a4a2cd96b6dd78b92742a2af3 /x11-misc
parent7a795be3ed6b29502cf5dccb5ea8294fc1ec2860 (diff)
gentoo auto-resync : 01:11:2022 - 15:07:30
Diffstat (limited to 'x11-misc')
-rw-r--r--x11-misc/Manifest.gzbin47358 -> 47358 bytes
-rw-r--r--x11-misc/nitrogen/Manifest5
-rw-r--r--x11-misc/nitrogen/files/nitrogen-1.6.1-fix-appdata-install-location.patch35
-rw-r--r--x11-misc/nitrogen/metadata.xml9
-rw-r--r--x11-misc/nitrogen/nitrogen-1.6.1-r2.ebuild (renamed from x11-misc/nitrogen/nitrogen-1.6.1-r1.ebuild)9
5 files changed, 53 insertions, 5 deletions
diff --git a/x11-misc/Manifest.gz b/x11-misc/Manifest.gz
index b8c3bf1f44a6..3435ffad4bd0 100644
--- a/x11-misc/Manifest.gz
+++ b/x11-misc/Manifest.gz
Binary files differ
diff --git a/x11-misc/nitrogen/Manifest b/x11-misc/nitrogen/Manifest
index c651f0d56a49..56833a3a8d94 100644
--- a/x11-misc/nitrogen/Manifest
+++ b/x11-misc/nitrogen/Manifest
@@ -1,4 +1,5 @@
+AUX nitrogen-1.6.1-fix-appdata-install-location.patch 1220 BLAKE2B 5f3dfafc6f5b0fa797f1095a2a744288c22a15965496f9dfc5d4309373ddef3130ab07e30e51f353fc1f92f94f371c292b7c69e3be6374182956cd4830a465b1 SHA512 e7fc6b189655a3888421a1612d146055bf2e64d8eafbeffd7ab1ae04798e6f89664bb5abb15820ba0ae2c5872400bfff87260a59631c3b2954ab892ce6686b3d
DIST nitrogen-1.6.1.tar.gz 314332 BLAKE2B 4e2ce39a770434e35250cc2ff2bff792f3943eef489a0dc9b897b47fb98c3791cf633974ded2481b6e29ceb00f26964115254cc047041e77954563e82c7cd44b SHA512 125bb62162da95c3aab8c146f93113162c171512ffd3e8e6011fff22f1a1b841d1ffc9b4df4fd1b0b62a3731c68cd30c8448dbc836e9861216f50068d8b08c9c
-EBUILD nitrogen-1.6.1-r1.ebuild 1000 BLAKE2B 7b9ee1fa0730358308da8ff0158e07968a461f7493673eda294e89063ce55c36e1eb7f6fdde5b0ab1b03f21f5043b9a3f752a5f0e6ff8e89b69190d1197dfc2f SHA512 356d8d60b759689ea87f5c724b18435bf6b3282b4ee7e549cb808cb2ebc48c751234c82a1b35b93f9ce707b6ea55bffbac4cfec2aa2ecb2dd4427cfd9b8d7ed7
+EBUILD nitrogen-1.6.1-r2.ebuild 1160 BLAKE2B b4204cca984324f224204b71832c96871a98958152b8ec5811a31b914ea0e4331b1a6a85434f71483f901469ab2dee7497eb14ab11cb818ba62020fd18bcf0f0 SHA512 137720585266898a34a2c91ed31b236312b290ae0330d0c90f7ff04653d6a87b04407a1ee1129e33b63896950db5ccd35ab3870b3ea81421e8ab5fbd01a78a19
EBUILD nitrogen-99999.ebuild 948 BLAKE2B 168dbbb5637c1f431f2445b60d418c9349c0113f8cccab5059f58d57f4e259876336730c7d7dd4cee0e347abb164c8e9456f0fa861a4114bb702c198bb67e4d3 SHA512 22b99582b6a06275f88539dd0bebabddb704bd3ba6ef12ebb0921e03a23505f4c514e57620089270f904817e41c6d3584b7ae3fa749b82ea1f00bc04d470b4de
-MISC metadata.xml 167 BLAKE2B 868e3b584722eaacf68273db062bb773d8c7e5d7ab2b81ca7e8397643bf7cc106c3a1033594401c99c54f667bb45d6b73f9048fc335580bbd44b4589ad26a832 SHA512 30caadd1496c3b9969136038239a1d8e01f236726b4022c2d7e19ca7575f25f735e556835e581afbf44fbd3e4104c40f2b5ef5fa70118d75c881fdf871962d0a
+MISC metadata.xml 395 BLAKE2B d999895a3291f2810c5226bafd2fb3ec8b9b70c55447dd872c59e2e4c7780142d0a8321c65ee8fa0f05772d6b94e739ae5c4b8be9d05cc969e6f4c4d44d11e16 SHA512 0318eacd983eda50114db58a148186525034097ba091fa2593630b8e1e6a1b0f3a3d7a1288f7ab8bb7851707928b43e6b9ff9884bacbc58168b2d149db9ff21c
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 <etc404@protonmail.com>
+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 <etc404@protonmail.com>
+---
+ 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>etc404@protonmail.com</email>
+ <name>Dylan Wolf</name>
+ </maintainer>
+ <maintainer type="project" proxied="proxy">
+ <email>proxy-maint@gentoo.org</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
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