Accepting request 952231 from GNOME:Next
- Add ac9b14f1c1bbca413987d0bbfeaad05804107e9a.patch: Fix build with meson 0.61.0. OBS-URL: https://build.opensuse.org/request/show/952231 OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/accountsservice?expand=0&rev=150
This commit is contained in:
parent
dce2f2a050
commit
f698701e68
29
ac9b14f1c1bbca413987d0bbfeaad05804107e9a.patch
Normal file
29
ac9b14f1c1bbca413987d0bbfeaad05804107e9a.patch
Normal file
@ -0,0 +1,29 @@
|
|||||||
|
From ac9b14f1c1bbca413987d0bbfeaad05804107e9a Mon Sep 17 00:00:00 2001
|
||||||
|
From: Luca Boccassi <bluca@debian.org>
|
||||||
|
Date: Sun, 31 Oct 2021 12:29:14 +0000
|
||||||
|
Subject: [PATCH] Fix build with meson 0.60
|
||||||
|
|
||||||
|
Positional parameters to merge_file() were never allowed and always
|
||||||
|
ignored, so just drop it.
|
||||||
|
See: https://github.com/mesonbuild/meson/issues/9441
|
||||||
|
|
||||||
|
Fixes #97
|
||||||
|
---
|
||||||
|
data/meson.build | 1 -
|
||||||
|
1 file changed, 1 deletion(-)
|
||||||
|
|
||||||
|
diff --git a/data/meson.build b/data/meson.build
|
||||||
|
index 70edf89..9e80299 100644
|
||||||
|
--- a/data/meson.build
|
||||||
|
+++ b/data/meson.build
|
||||||
|
@@ -33,7 +33,6 @@ configure_file(
|
||||||
|
policy = act_namespace.to_lower() + '.policy'
|
||||||
|
|
||||||
|
i18n.merge_file(
|
||||||
|
- policy,
|
||||||
|
input: policy + '.in',
|
||||||
|
output: policy,
|
||||||
|
po_dir: po_dir,
|
||||||
|
--
|
||||||
|
GitLab
|
||||||
|
|
@ -1,3 +1,9 @@
|
|||||||
|
-------------------------------------------------------------------
|
||||||
|
Tue Feb 1 09:20:24 UTC 2022 - Bjørn Lie <bjorn.lie@gmail.com>
|
||||||
|
|
||||||
|
- Add ac9b14f1c1bbca413987d0bbfeaad05804107e9a.patch: Fix build
|
||||||
|
with meson 0.61.0.
|
||||||
|
|
||||||
-------------------------------------------------------------------
|
-------------------------------------------------------------------
|
||||||
Thu Nov 4 10:39:37 UTC 2021 - Bjørn Lie <bjorn.lie@gmail.com>
|
Thu Nov 4 10:39:37 UTC 2021 - Bjørn Lie <bjorn.lie@gmail.com>
|
||||||
|
|
||||||
|
@ -1,7 +1,7 @@
|
|||||||
#
|
#
|
||||||
# spec file for package accountsservice
|
# spec file for package accountsservice
|
||||||
#
|
#
|
||||||
# Copyright (c) 2021 SUSE LLC
|
# Copyright (c) 2022 SUSE LLC
|
||||||
#
|
#
|
||||||
# All modifications and additions to the file contributed by third parties
|
# All modifications and additions to the file contributed by third parties
|
||||||
# remain the property of their copyright owners, unless otherwise agreed
|
# remain the property of their copyright owners, unless otherwise agreed
|
||||||
@ -38,6 +38,8 @@ Patch3: accountsservice-wtmp-io-improvements.patch
|
|||||||
Patch4: accountsservice-fix-gdm-crash.patch
|
Patch4: accountsservice-fix-gdm-crash.patch
|
||||||
# PATCH-FIX-OPENSUSE harden_accounts-daemon.service.patch jsegitz@suse.com -- For details please see https://en.opensuse.org/openSUSE:Security_Features#Systemd_hardening_effort
|
# PATCH-FIX-OPENSUSE harden_accounts-daemon.service.patch jsegitz@suse.com -- For details please see https://en.opensuse.org/openSUSE:Security_Features#Systemd_hardening_effort
|
||||||
Patch5: harden_accounts-daemon.service.patch
|
Patch5: harden_accounts-daemon.service.patch
|
||||||
|
# PATCH-FIX-UPSTREAM ac9b14f1c1bbca413987d0bbfeaad05804107e9a.patch -- Fix build with meson 0.61.0
|
||||||
|
Patch6: https://gitlab.freedesktop.org/accountsservice/accountsservice/-/commit/ac9b14f1c1bbca413987d0bbfeaad05804107e9a.patch
|
||||||
|
|
||||||
## SLE and Leap only patches start at 1000
|
## SLE and Leap only patches start at 1000
|
||||||
# PATCH-FEATURE-SLE as-fate318433-prevent-same-account-multi-logins.patch fate#318433 cxiong@suse.com -- prevent multiple simultaneous login.
|
# PATCH-FEATURE-SLE as-fate318433-prevent-same-account-multi-logins.patch fate#318433 cxiong@suse.com -- prevent multiple simultaneous login.
|
||||||
@ -106,6 +108,7 @@ querying and manipulating user account information.
|
|||||||
%patch3 -p1
|
%patch3 -p1
|
||||||
%patch4 -p1
|
%patch4 -p1
|
||||||
%patch5 -p1
|
%patch5 -p1
|
||||||
|
%patch6 -p1
|
||||||
|
|
||||||
# SLE and Leap patches start at 1000
|
# SLE and Leap patches start at 1000
|
||||||
%if 0%{?sle_version}
|
%if 0%{?sle_version}
|
||||||
|
Loading…
Reference in New Issue
Block a user