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
This commit is contained in:
Bjørn Lie 2022-02-19 23:26:33 +00:00 committed by Git OBS Bridge
parent e69c83f7a7
commit 8acc3b3586
3 changed files with 9 additions and 3 deletions

View File

@ -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 <marv@exherbo.org>
Date: Wed, 26 Jan 2022 23:08:58 +0100
Subject: [PATCH] meson: drop unused argument for i18n.merge_file()

View File

@ -1,3 +1,9 @@
-------------------------------------------------------------------
Fri Feb 18 08:37:49 UTC 2022 - Yifan Jiang <yfjiang@suse.com>
- Rename 283.patch to the name of final commit id
afa7e4bb9c519e2daf500a6079088669500768c0.patch.
-------------------------------------------------------------------
Tue Feb 1 12:46:22 UTC 2022 - Bjørn Lie <bjorn.lie@gmail.com>

View File

@ -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