diff --git a/283.patch b/283.patch new file mode 100644 index 0000000..1319ad6 --- /dev/null +++ b/283.patch @@ -0,0 +1,38 @@ +From bc21912efe8521f53d703e28b36c6f1246ac2054 Mon Sep 17 00:00:00 2001 +From: Marvin Schmidt +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 + diff --git a/gnome-settings-daemon.changes b/gnome-settings-daemon.changes index 29022d7..7f6bc93 100644 --- a/gnome-settings-daemon.changes +++ b/gnome-settings-daemon.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Tue Feb 1 12:46:22 UTC 2022 - Bjørn Lie + +- 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. + ------------------------------------------------------------------- Tue Dec 21 01:48:48 UTC 2021 - Yifan Jiang diff --git a/gnome-settings-daemon.spec b/gnome-settings-daemon.spec index 27018dc..f9eb369 100644 --- a/gnome-settings-daemon.spec +++ b/gnome-settings-daemon.spec @@ -1,7 +1,7 @@ # # spec file for package gnome-settings-daemon # -# Copyright (c) 2021 SUSE LLC +# Copyright (c) 2022 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -42,14 +42,16 @@ Patch1: gnome-settings-daemon-initial-keyboard.patch Patch2: gnome-settings-daemon-switch-Japanese-default-input-to-mozc.patch # PATCH-FIX-UPSTREAM gnome-settings-daemon-bgo793253.patch bgo#793253 dimstar@opensuse.org -- Fix no-return-in-nonvoid-function Patch3: gnome-settings-daemon-bgo793253.patch -# PATCH-FEATURE-OPENSUSE gnome-settings-daemon-notify-idle-resumed.patch bnc#439018 bnc#708182 bgo#575467 hpj@suse.com -- notify user about auto suspend when returning from sleep -Patch4: gnome-settings-daemon-notify-idle-resumed.patch -# PATCH-FIX-OPENSUSE gnome-settings-daemon-bnc873545-hide-warnings.patch bnc#873545 fezhang@suse.com -- hide the warnings when g-s-d cannot find colord running, which is expected on SLES -Patch5: gnome-settings-daemon-bnc873545-hide-warnings.patch -# PATCH-FIX-OPENSUSE gnome-settings-daemon-more-power-button-actions.patch bsc#996342 fezhang@suse.com -- Bring back the "shutdown" and "interactive" power button actions. -Patch7: gnome-settings-daemon-more-power-button-actions.patch +# PATCH-FIX-UPSTREAM https://gitlab.gnome.org/GNOME/gnome-settings-daemon/-/merge_requests/283.patch -- Fix build with meson 0.60.0 and newer +Patch8: https://gitlab.gnome.org/GNOME/gnome-settings-daemon/-/merge_requests/283.patch -## SLE-only patches start at 1000 +## SLE/LEAP-only patches start at 1000 +# PATCH-FEATURE-OPENSUSE gnome-settings-daemon-notify-idle-resumed.patch bnc#439018 bnc#708182 bgo#575467 hpj@suse.com -- notify user about auto suspend when returning from sleep +Patch1000: gnome-settings-daemon-notify-idle-resumed.patch +# PATCH-FIX-OPENSUSE gnome-settings-daemon-bnc873545-hide-warnings.patch bnc#873545 fezhang@suse.com -- hide the warnings when g-s-d cannot find colord running, which is expected on SLES +Patch1001: gnome-settings-daemon-bnc873545-hide-warnings.patch +# PATCH-FIX-OPENSUSE gnome-settings-daemon-more-power-button-actions.patch bsc#996342 fezhang@suse.com -- Bring back the "shutdown" and "interactive" power button actions. +Patch1002: gnome-settings-daemon-more-power-button-actions.patch BuildRequires: cups-devel BuildRequires: fdupes @@ -143,11 +145,13 @@ contact the settings daemon via its DBus interface. %patch1 -p1 %patch2 -p1 %patch3 -p1 +%patch8 -p1 + # Enable the patches for both Leap 15 and SLE 15, please find the clarification at bsc#1158476. %if 0%{?sle_version} >= 150000 -%patch4 -p1 -%patch5 -p1 -%patch7 -p1 +%patch1000 -p1 +%patch1001 -p1 +%patch1002 -p1 %endif %build