forked from pool/gnome-settings-daemon
Bjørn Lie
e69c83f7a7
- Add 283.patch: Fix build with meson 0.60.0 and newer. - Renumber SLE/LEAP only patches to 1000+ range, make the separation of appliance more clear. OBS-URL: https://build.opensuse.org/request/show/952683 OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/gnome-settings-daemon?expand=0&rev=386
39 lines
1011 B
Diff
39 lines
1011 B
Diff
From bc21912efe8521f53d703e28b36c6f1246ac2054 Mon Sep 17 00:00:00 2001
|
|
From: Marvin Schmidt <marv@exherbo.org>
|
|
Date: Wed, 26 Jan 2022 23:08:58 +0100
|
|
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.
|
|
---
|
|
plugins/power/meson.build | 1 -
|
|
plugins/wacom/meson.build | 1 -
|
|
2 files changed, 2 deletions(-)
|
|
|
|
diff --git a/plugins/power/meson.build b/plugins/power/meson.build
|
|
index 69e619f2..014bb6da 100644
|
|
--- a/plugins/power/meson.build
|
|
+++ b/plugins/power/meson.build
|
|
@@ -76,7 +76,6 @@ if host_is_linux
|
|
)
|
|
|
|
i18n.merge_file(
|
|
- policy,
|
|
input: policy_in,
|
|
output: policy,
|
|
po_dir: po_dir,
|
|
diff --git a/plugins/wacom/meson.build b/plugins/wacom/meson.build
|
|
index d8dd0ec7..c00323d4 100644
|
|
--- a/plugins/wacom/meson.build
|
|
+++ b/plugins/wacom/meson.build
|
|
@@ -7,7 +7,6 @@ policy_in = configure_file(
|
|
)
|
|
|
|
i18n.merge_file(
|
|
- policy,
|
|
input: policy_in,
|
|
output: policy,
|
|
po_dir: po_dir,
|
|
--
|
|
GitLab
|
|
|