diff options
author | V3n3RiX <venerix@koprulu.sector> | 2022-02-02 01:39:05 +0000 |
---|---|---|
committer | V3n3RiX <venerix@koprulu.sector> | 2022-02-02 01:39:05 +0000 |
commit | fcc5224904648a8e6eb528d7603154160a20022f (patch) | |
tree | 3bfce096b38a9cea8eed13fc70c1526c456e9abd /dev-vcs/gitg/files | |
parent | 2fd57282f0262ca084e05b0f2c63fbada395d02b (diff) |
gentoo resync : 02.02.2022
Diffstat (limited to 'dev-vcs/gitg/files')
-rw-r--r-- | dev-vcs/gitg/files/41-fix-build-with-meson-0.61.1.patch | 38 |
1 files changed, 38 insertions, 0 deletions
diff --git a/dev-vcs/gitg/files/41-fix-build-with-meson-0.61.1.patch b/dev-vcs/gitg/files/41-fix-build-with-meson-0.61.1.patch new file mode 100644 index 000000000000..0467f7d1ad89 --- /dev/null +++ b/dev-vcs/gitg/files/41-fix-build-with-meson-0.61.1.patch @@ -0,0 +1,38 @@ +https://gitlab.gnome.org/GNOME/gitg/-/commit/1978973b12848741b08695ec2020bac98584d636 +https://bugs.gentoo.org/831666 + +From: Jan Beich <jbeich@FreeBSD.org> +Date: Mon, 24 Jan 2022 12:17:52 +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:8:0: ERROR: Function does not take positional arguments. +data/meson.build:44:0: ERROR: Function does not take positional arguments. +--- + data/meson.build | 2 -- + 1 file changed, 2 deletions(-) + +diff --git a/data/meson.build b/data/meson.build +index a8b90fd1..2413531d 100644 +--- a/data/meson.build ++++ b/data/meson.build +@@ -6,7 +6,6 @@ desktop_config = configuration_data() + desktop_config.set('icon', application_id) + desktop_config.set('binary', gitg_name) + i18n.merge_file( +- desktop, + type: 'desktop', + input: configure_file( + input: desktop + '.in.in', +@@ -42,7 +41,6 @@ appdata_config = configuration_data() + appdata_config.set('app-id', application_id) + appdata_config.set('gettext', gitg_name) + i18n.merge_file( +- appdata, + type: 'xml', + input: configure_file( + input: appdata + '.in.in', +-- +GitLab + |