commit: 3dde8a52aecf7fcb89442b5b023e77974100e53f Author: Michael Mair-Keimberger <mmk <AT> levelnine <DOT> at> AuthorDate: Fri Mar 10 06:47:58 2023 +0000 Commit: Joonas Niilola <juippis <AT> gentoo <DOT> org> CommitDate: Fri Mar 10 07:03:23 2023 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3dde8a52
media-gfx/frogr: remove unused patch(es) Signed-off-by: Michael Mair-Keimberger <mmk <AT> levelnine.at> Closes: https://github.com/gentoo/gentoo/pull/30039 Signed-off-by: Joonas Niilola <juippis <AT> gentoo.org> .../frogr/files/frogr-1.5-meson-0.61-build.patch | 33 ---------------------- .../frogr/files/frogr-1.5-warning-level.patch | 28 ------------------ 2 files changed, 61 deletions(-) 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 <jbe...@freebsd.org> -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 <msanc...@gnome.org> -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 -
