From 99a3daa1cdf93bd422df13b295f5225d7670e7cd41581092be9c318b54820389 Mon Sep 17 00:00:00 2001 From: Dominique Leuenberger Date: Wed, 14 Feb 2024 17:28:29 +0000 Subject: [PATCH] Accepting request 1146552 from GNOME:Next - First part to fix build with GCC 14: + Inject patched mocklibc-1.0.tar.gz: only some header modifications to address implicit declaration of print_indent. + Add accountsservice-mocklib-gcc14.patch: patch meson' subproject definition to validate the injected tarball. OBS-URL: https://build.opensuse.org/request/show/1146552 OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/accountsservice?expand=0&rev=169 --- accountsservice-mocklib-gcc14.patch | 13 +++++++++++++ accountsservice.changes | 9 +++++++++ accountsservice.spec | 17 ++++++++++++----- mocklibc-1.0.tar.gz | 3 +++ 4 files changed, 37 insertions(+), 5 deletions(-) create mode 100644 accountsservice-mocklib-gcc14.patch create mode 100644 mocklibc-1.0.tar.gz diff --git a/accountsservice-mocklib-gcc14.patch b/accountsservice-mocklib-gcc14.patch new file mode 100644 index 0000000..497cf2c --- /dev/null +++ b/accountsservice-mocklib-gcc14.patch @@ -0,0 +1,13 @@ +Index: accountsservice-23.13.9/subprojects/mocklibc.wrap +=================================================================== +--- accountsservice-23.13.9.orig/subprojects/mocklibc.wrap ++++ accountsservice-23.13.9/subprojects/mocklibc.wrap +@@ -3,7 +3,7 @@ directory = mocklibc-1.0 + + source_url = https://storage.googleapis.com/google-code-archive-downloads/v2/code.google.com/mocklibc/mocklibc-1.0.tar.gz + source_filename = mocklibc-1.0.tar.gz +-source_hash = b2236a6af1028414783e9734a46ea051916ec226479d6a55a3bb823bff68f120 ++source_hash = 48966f7a5d3f2139ffdc1e700de7deb9390f852cd4f2a7b97e55029c14097c6e + + patch_url = https://wrapdb.mesonbuild.com/v1/projects/mocklibc/1.0/2/get_zip + patch_filename = mocklibc-1.0-2-wrap.zip diff --git a/accountsservice.changes b/accountsservice.changes index 5cbd5a3..26c268c 100644 --- a/accountsservice.changes +++ b/accountsservice.changes @@ -1,3 +1,12 @@ +------------------------------------------------------------------- +Wed Feb 14 10:39:36 UTC 2024 - Dominique Leuenberger + +- First part to fix build with GCC 14: + + Inject patched mocklibc-1.0.tar.gz: only some header + modifications to address implicit declaration of print_indent. + + Add accountsservice-mocklib-gcc14.patch: patch meson' + subproject definition to validate the injected tarball. + ------------------------------------------------------------------- Tue Nov 28 11:56:40 UTC 2023 - Dominique Leuenberger diff --git a/accountsservice.spec b/accountsservice.spec index ed32bae..8367312 100644 --- a/accountsservice.spec +++ b/accountsservice.spec @@ -1,7 +1,7 @@ # # spec file for package accountsservice # -# Copyright (c) 2023 SUSE LLC +# Copyright (c) 2024 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -27,14 +27,18 @@ License: GPL-3.0-or-later Group: System/Daemons URL: https://www.freedesktop.org/wiki/Software/AccountsService/ Source0: https://www.freedesktop.org/software/accountsservice/%{name}-%{version}.tar.xz +# Patched mocklibc source to fix build with GCC 14 +Source1: mocklibc-1.0.tar.gz +# PATCH-FIX-UPSTREAM accountsservice-mocklib-gcc14.patch -- Fix meson checksum to accept patched tarball +Patch0: accountsservice-mocklib-gcc14.patch -# WARNING: do not remove/significantly change patch0 without updating the relevant patch in gdm too +# WARNING: do not remove/significantly change patch1 without updating the relevant patch in gdm too # PATCH-FIX-OPENSUSE accountsservice-sysconfig.patch bnc#688071 vuntz@opensuse.org -- Read/write autologin configuration from sysconfig, like gdm (see gdm-sysconfig-settings.patch) WAS PATCH-FIX-OPENSUSE -Patch0: accountsservice-sysconfig.patch +Patch1: accountsservice-sysconfig.patch # PATCH-FIX-OPENSUSE accountsservice-filter-suse-accounts.patch vuntz@opensuse.org -- Filter out some system users that are specific to openSUSE -Patch1: accountsservice-filter-suse-accounts.patch +Patch2: accountsservice-filter-suse-accounts.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 -Patch2: harden_accounts-daemon.service.patch +Patch3: harden_accounts-daemon.service.patch ## 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. @@ -112,9 +116,12 @@ This package contains the Vala bindings for accountservice. %prep %setup -q +# inject patched mocklibc tarball into package cache +cp %{SOURCE1} subprojects/packagecache/ %patch -P 0 -p1 %patch -P 1 -p1 %patch -P 2 -p1 +%patch -P 3 -p1 # SLE and Leap patches start at 1000 %if 0%{?sle_version} diff --git a/mocklibc-1.0.tar.gz b/mocklibc-1.0.tar.gz new file mode 100644 index 0000000..2e6d93b --- /dev/null +++ b/mocklibc-1.0.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:48966f7a5d3f2139ffdc1e700de7deb9390f852cd4f2a7b97e55029c14097c6e +size 223730