Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package gnome-settings-daemon for
openSUSE:Factory checked in at 2022-02-09 20:37:58
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/gnome-settings-daemon (Old)
and /work/SRC/openSUSE:Factory/.gnome-settings-daemon.new.1898 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "gnome-settings-daemon"
Wed Feb 9 20:37:58 2022 rev:177 rq:952722 version:41.0
Changes:
--------
---
/work/SRC/openSUSE:Factory/gnome-settings-daemon/gnome-settings-daemon.changes
2021-12-22 20:18:51.207869179 +0100
+++
/work/SRC/openSUSE:Factory/.gnome-settings-daemon.new.1898/gnome-settings-daemon.changes
2022-02-09 20:38:01.394207079 +0100
@@ -1,0 +2,7 @@
+Tue Feb 1 12:46:22 UTC 2022 - Bj??rn Lie <[email protected]>
+
+- 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.
+
+-------------------------------------------------------------------
New:
----
283.patch
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ gnome-settings-daemon.spec ++++++
--- /var/tmp/diff_new_pack.g3Sl1W/_old 2022-02-09 20:38:03.094211145 +0100
+++ /var/tmp/diff_new_pack.g3Sl1W/_new 2022-02-09 20:38:03.102211165 +0100
@@ -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 @@
Patch2:
gnome-settings-daemon-switch-Japanese-default-input-to-mozc.patch
# PATCH-FIX-UPSTREAM gnome-settings-daemon-bgo793253.patch bgo#793253
[email protected] -- 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
+
+## SLE/LEAP-only patches start at 1000
# PATCH-FEATURE-OPENSUSE gnome-settings-daemon-notify-idle-resumed.patch
bnc#439018 bnc#708182 bgo#575467 [email protected] -- notify user about auto
suspend when returning from sleep
-Patch4: gnome-settings-daemon-notify-idle-resumed.patch
+Patch1000: gnome-settings-daemon-notify-idle-resumed.patch
# PATCH-FIX-OPENSUSE gnome-settings-daemon-bnc873545-hide-warnings.patch
bnc#873545 [email protected] -- hide the warnings when g-s-d cannot find colord
running, which is expected on SLES
-Patch5: gnome-settings-daemon-bnc873545-hide-warnings.patch
+Patch1001: gnome-settings-daemon-bnc873545-hide-warnings.patch
# PATCH-FIX-OPENSUSE gnome-settings-daemon-more-power-button-actions.patch
bsc#996342 [email protected] -- Bring back the "shutdown" and "interactive"
power button actions.
-Patch7: gnome-settings-daemon-more-power-button-actions.patch
-
-## SLE-only patches start at 1000
+Patch1002: gnome-settings-daemon-more-power-button-actions.patch
BuildRequires: cups-devel
BuildRequires: fdupes
@@ -143,11 +145,13 @@
%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
++++++ 283.patch ++++++
>From bc21912efe8521f53d703e28b36c6f1246ac2054 Mon Sep 17 00:00:00 2001
From: Marvin Schmidt <[email protected]>
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
