From f95eeaf7db6ca1bfbb34c05fdad9ed9bb603b1c8 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Fri, 10 Mar 2023 12:04:40 +0000 Subject: gentoo auto-resync : 10:03:2023 - 12:04:40 --- media-gfx/frogr/Manifest | 2 -- .../frogr/files/frogr-1.5-meson-0.61-build.patch | 33 ---------------------- .../frogr/files/frogr-1.5-warning-level.patch | 28 ------------------ 3 files changed, 63 deletions(-) delete mode 100644 media-gfx/frogr/files/frogr-1.5-meson-0.61-build.patch delete mode 100644 media-gfx/frogr/files/frogr-1.5-warning-level.patch (limited to 'media-gfx/frogr') diff --git a/media-gfx/frogr/Manifest b/media-gfx/frogr/Manifest index c677a47a22c1..ee5b56580da4 100644 --- a/media-gfx/frogr/Manifest +++ b/media-gfx/frogr/Manifest @@ -1,5 +1,3 @@ -AUX frogr-1.5-meson-0.61-build.patch 1341 BLAKE2B d1c1cdc5eb3f479ae16cc8e5bc5c164904c63d802e5ae2de5fe29d3209462fc65f2750a80ac95a7a3f83c9edd4ebf9067e80166f3ffa18d8380ae221d1312e11 SHA512 b46c7c8d42a9be4bfd90797d2ac77b7f18c2d7e5c571f3a19830849265915389c9c756199297ba6f8969074064beddeb96e87bb1dbbdcf3f9310240a783a0d30 -AUX frogr-1.5-warning-level.patch 752 BLAKE2B b0fd94da39939daa195bd4da03b6701b6336e49a7f60fdfe703853d27a562b8dd29bc923cecf08f13acb3200935dfdb43ff1bcf16cda78d80e6980654da4bde5 SHA512 3aa0522da679eba07f3f32134a19adaa6ffdb25bec46c4202e8caf2c38c93749c565f315d5265fca56a618a60d01fe11ef04f971a6c5168a33a42f0187182fbd DIST frogr-1.7.tar.xz 2247476 BLAKE2B 16b5c546b61234310390f4dadee0094e671f141121023833123e57de7f90666a38a117dedece0cba53a1500e8bce20e79dd690c598e010327a32aee7b11afe1a SHA512 73531186dbe3fdb4b937d54c02b471b444bac059de4ea02913b5fef255816af0b0ef89bbb449e443ee5b50f0d156960efe190f5988a1a50f8ecfe2eb1e10b89f EBUILD frogr-1.7.ebuild 885 BLAKE2B a01a8662b054629c5175e4931d14048402de3081c127d8e4679d5e5778bb36c908fe88a7432a543fa73ba3bb548681c96cd01d9f47355b9f1d8e037e519d2b71 SHA512 5c1fe8bd3f4a933fa8c6a432fe8e4ec7f36a85e30744941ec4c2c337486acb9f857e7e31e8325d07fc7ae1ce18f4ac35410cdad78a5a4dee7b7bdd90193fbf33 MISC metadata.xml 709 BLAKE2B a81cb2f0bfe655765fb3fd3ec14c2d1618bd7ccb4ac4a11d2c9f5692d450303cc05fa43fe9a474d5de16314b8d426fb6d62c2d1fdb56725d0a2d40e3b6cdf325 SHA512 894700cc8301eef0202979ff212edbdcaf1665651a97cfef201f8c92fe7f63dd8205972215e3dbbf6a012c09a8637020503fe2ec2597bcb8816e18f13a7b2149 diff --git a/media-gfx/frogr/files/frogr-1.5-meson-0.61-build.patch b/media-gfx/frogr/files/frogr-1.5-meson-0.61-build.patch deleted file mode 100644 index cb72250ae72f..000000000000 --- a/media-gfx/frogr/files/frogr-1.5-meson-0.61-build.patch +++ /dev/null @@ -1,33 +0,0 @@ -https://gitlab.gnome.org/GNOME/frogr/-/merge_requests/5 -https://bugs.gentoo.org/831497 - -From 1eeb32b94b9e14e7ea2b9267e3378bae9e3e852d Mon Sep 17 00:00:00 2001 -From: Jan Beich -Date: Mon, 24 Jan 2022 12:22:25 +0000 -Subject: [PATCH] meson: drop unused argument for i18n.merge_file() - -Ignored in Meson < 0.60.0, deprecated since 0.60.1 and fatal since 0.61.0. - -data/meson.build:32:0: ERROR: Function does not take positional arguments. -data/meson.build:42:0: ERROR: Function does not take positional arguments. ---- a/data/meson.build -+++ b/data/meson.build -@@ -29,7 +29,7 @@ data_conf.set('BINDIR', join_paths(prefix, bindir)) - generated_desktop = configure_file(input: 'org.gnome.frogr.desktop.in.in', - output: 'org.gnome.frogr.desktop.in', - configuration: data_conf) --i18n.merge_file('desktop', -+i18n.merge_file( - input: generated_desktop, - output: 'org.gnome.frogr.desktop', - install: true, -@@ -39,7 +39,7 @@ i18n.merge_file('desktop', - - # Appdata XML file - appdatadir = join_paths(datadir, 'metainfo') --i18n.merge_file('appdata', -+i18n.merge_file( - input: 'org.gnome.frogr.appdata.xml.in', - output: 'org.gnome.frogr.appdata.xml', - install: true, -GitLab diff --git a/media-gfx/frogr/files/frogr-1.5-warning-level.patch b/media-gfx/frogr/files/frogr-1.5-warning-level.patch deleted file mode 100644 index 68020c3e16b8..000000000000 --- a/media-gfx/frogr/files/frogr-1.5-warning-level.patch +++ /dev/null @@ -1,28 +0,0 @@ -From 623d7e397baff3a8ab1695e190b13bc60153b64c Mon Sep 17 00:00:00 2001 -From: Mario Sanchez Prada -Date: Mon, 7 Dec 2020 22:26:34 +0100 -Subject: [PATCH] Use meson's "warning_level" build option instead of - "warnlevel" - -The correct option's name is "warning_level", so change it for it -to actually be effective while building. ---- - meson.build | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/meson.build b/meson.build -index 37f76d7..87e4de3 100644 ---- a/meson.build -+++ b/meson.build -@@ -2,7 +2,7 @@ project('frogr', 'c', - version: '1.5', - license: 'GPL3', - default_options: [ -- 'warnlevel=2', -+ 'warning_level=2', - 'werror=true' - ]) - --- -GitLab - -- cgit v1.2.3