From 8acc3b358642e751e9e740f71ddc28298e9c764d2adb6cf49c32c485c0d5b51c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B8rn=20Lie?= Date: Sat, 19 Feb 2022 23:26:33 +0000 Subject: [PATCH] Accepting request 955818 from home:yfjiang:branches:GNOME:Factory - Rename 283.patch to the name of final commit id afa7e4bb9c519e2daf500a6079088669500768c0.patch. OBS-URL: https://build.opensuse.org/request/show/955818 OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/gnome-settings-daemon?expand=0&rev=387 --- 283.patch => afa7e4bb9c519e2daf500a6079088669500768c0.patch | 2 +- gnome-settings-daemon.changes | 6 ++++++ gnome-settings-daemon.spec | 4 ++-- 3 files changed, 9 insertions(+), 3 deletions(-) rename 283.patch => afa7e4bb9c519e2daf500a6079088669500768c0.patch (93%) diff --git a/283.patch b/afa7e4bb9c519e2daf500a6079088669500768c0.patch similarity index 93% rename from 283.patch rename to afa7e4bb9c519e2daf500a6079088669500768c0.patch index 1319ad6..2a4fd26 100644 --- a/283.patch +++ b/afa7e4bb9c519e2daf500a6079088669500768c0.patch @@ -1,4 +1,4 @@ -From bc21912efe8521f53d703e28b36c6f1246ac2054 Mon Sep 17 00:00:00 2001 +From afa7e4bb9c519e2daf500a6079088669500768c0 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() diff --git a/gnome-settings-daemon.changes b/gnome-settings-daemon.changes index 7f6bc93..e40cde0 100644 --- a/gnome-settings-daemon.changes +++ b/gnome-settings-daemon.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Fri Feb 18 08:37:49 UTC 2022 - Yifan Jiang + +- Rename 283.patch to the name of final commit id + afa7e4bb9c519e2daf500a6079088669500768c0.patch. + ------------------------------------------------------------------- Tue Feb 1 12:46:22 UTC 2022 - Bjørn Lie diff --git a/gnome-settings-daemon.spec b/gnome-settings-daemon.spec index f9eb369..5c36b4b 100644 --- a/gnome-settings-daemon.spec +++ b/gnome-settings-daemon.spec @@ -42,8 +42,8 @@ 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-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 +# PATCH-FIX-UPSTREAM https://gitlab.gnome.org/GNOME/gnome-settings-daemon/commit/afa7e4bb9c519e2daf500a6079088669500768c0.patch -- Fix build with meson 0.60.0 and newer +Patch8: https://gitlab.gnome.org/GNOME/gnome-settings-daemon/commit/afa7e4bb9c519e2daf500a6079088669500768c0.patch ## 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