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 /media-gfx/gnome-font-viewer/files | |
parent | 2fd57282f0262ca084e05b0f2c63fbada395d02b (diff) |
gentoo resync : 02.02.2022
Diffstat (limited to 'media-gfx/gnome-font-viewer/files')
-rw-r--r-- | media-gfx/gnome-font-viewer/files/gnome-font-viewer-41.0-fix-meson-0.61-build.patch | 31 |
1 files changed, 31 insertions, 0 deletions
diff --git a/media-gfx/gnome-font-viewer/files/gnome-font-viewer-41.0-fix-meson-0.61-build.patch b/media-gfx/gnome-font-viewer/files/gnome-font-viewer-41.0-fix-meson-0.61-build.patch new file mode 100644 index 000000000000..545f294206a7 --- /dev/null +++ b/media-gfx/gnome-font-viewer/files/gnome-font-viewer-41.0-fix-meson-0.61-build.patch @@ -0,0 +1,31 @@ +https://gitlab.gnome.org/GNOME/gnome-font-viewer/-/commit/218166246e29a39e2eac8d3f06976038571b0603 +https://bugs.gentoo.org/831639 + +From: r-value <i@rvalue.moe> +Date: Thu, 30 Dec 2021 17:14:47 +0800 +Subject: [PATCH] Fix meson build with meson 0.60.0+ + +`i18n.merge_file` has been ignoring positional arguments for a time +and explicitly rejects with error since meson 0.60.0 +--- a/data/meson.build ++++ b/data/meson.build +@@ -1,6 +1,6 @@ + appdatadir = join_paths(datadir, 'metainfo') + appdata_file = 'org.gnome.font-viewer.appdata.xml' +-merged_appdata = i18n.merge_file(appdata_file, ++merged_appdata = i18n.merge_file( + input: appdata_file + '.in', + output: appdata_file, + po_dir: '../po', +--- a/src/meson.build ++++ b/src/meson.build +@@ -39,7 +39,7 @@ desktop_file = 'org.gnome.font-viewer.desktop' + desktop_conf = configuration_data() + desktop_conf.set('VERSION', meson.project_version()) + desktop_conf.set('APPLICATION_ID', application_id) +-i18n.merge_file(desktop_file, ++i18n.merge_file( + input: configure_file(input: desktop_file + '.in.in', + output: desktop_file + '.in', + configuration: desktop_conf), +GitLab |