diff mbox series

[meta-gnome] accountsservice: update 22.08.8 -> 23.13.9

Message ID 20250225131704.1792461-1-f_l_k@t-online.de
State New
Headers show
Series [meta-gnome] accountsservice: update 22.08.8 -> 23.13.9 | expand

Commit Message

Markus Volk Feb. 25, 2025, 1:17 p.m. UTC 
- add backport patch to fix:

| ../accountsservice-23.13.9/subprojects/mocklibc-1.0/src/netgroup-debug.c:25:3: error: implicit declaration of function 'print_indent' [-Wimplicit-function-declaration]
|    25 |   print_indent(stream, indent);

Signed-off-by: Markus Volk <f_l_k@t-online.de>
---
 .../accountsservice-23.13.9-c99-fixes.patch   | 54 +++++++++++++++++++
 ..._22.08.8.bb => accountsservice_23.13.9.bb} |  7 ++-
 2 files changed, 59 insertions(+), 2 deletions(-)
 create mode 100644 meta-gnome/recipes-support/accountsservice/accountsservice/accountsservice-23.13.9-c99-fixes.patch
 rename meta-gnome/recipes-support/accountsservice/{accountsservice_22.08.8.bb => accountsservice_23.13.9.bb} (79%)
diff mbox series

Patch

diff --git a/meta-gnome/recipes-support/accountsservice/accountsservice/accountsservice-23.13.9-c99-fixes.patch b/meta-gnome/recipes-support/accountsservice/accountsservice/accountsservice-23.13.9-c99-fixes.patch
new file mode 100644
index 0000000000..596f7b7d3f
--- /dev/null
+++ b/meta-gnome/recipes-support/accountsservice/accountsservice/accountsservice-23.13.9-c99-fixes.patch
@@ -0,0 +1,54 @@ 
+https://bugs.gentoo.org/930715
+https://gitlab.freedesktop.org/accountsservice/accountsservice/-/commit/da65bee12d9118fe1a49c8718d428fe61d232339
+
+From da65bee12d9118fe1a49c8718d428fe61d232339 Mon Sep 17 00:00:00 2001
+From: Ray Strode <rstrode@redhat.com>
+Date: Tue, 11 Apr 2023 10:09:07 -0400
+Subject: [PATCH] mocklibc: Fix compiler warning
+
+print_indent is defined in one file and used in another without a
+forward declaration. That leads to a compiler warning/error.
+
+This commit fixes that.
+
+Upstream-Status: Backport [https://gitweb.gentoo.org/repo/gentoo.git/tree/sys-apps/accountsservice/files/accountsservice-23.13.9-c99-fixes.patch]
+
+Signed-off-by: Markus Volk <f_l_k@t-online.de>
+---
+ subprojects/mocklibc.wrap                           |  2 ++
+ subprojects/packagefiles/mocklibc-print-indent.diff | 13 +++++++++++++
+ 2 files changed, 15 insertions(+)
+ create mode 100644 subprojects/packagefiles/mocklibc-print-indent.diff
+
+diff --git a/subprojects/mocklibc.wrap b/subprojects/mocklibc.wrap
+index af82298..539ee83 100644
+--- a/subprojects/mocklibc.wrap
++++ b/subprojects/mocklibc.wrap
+@@ -8,3 +8,5 @@ source_hash = b2236a6af1028414783e9734a46ea051916ec226479d6a55a3bb823bff68f120
+ patch_url = https://wrapdb.mesonbuild.com/v1/projects/mocklibc/1.0/2/get_zip
+ patch_filename = mocklibc-1.0-2-wrap.zip
+ patch_hash = 0280f96a2eeb3c023e5acf4e00cef03d362868218d4a85347ea45137c0ef6c56
++
++diff_files = mocklibc-print-indent.diff
+diff --git a/subprojects/packagefiles/mocklibc-print-indent.diff b/subprojects/packagefiles/mocklibc-print-indent.diff
+new file mode 100644
+index 0000000..4aaed40
+--- /dev/null
++++ b/subprojects/packagefiles/mocklibc-print-indent.diff
+@@ -0,0 +1,13 @@
++diff -up mocklibc-1.0/src/netgroup-debug.c.print-indent mocklibc-1.0/src/netgroup-debug.c
++--- mocklibc-1.0/src/netgroup-debug.c.print-indent	2023-04-11 10:20:53.717381559 -0400
+++++ mocklibc-1.0/src/netgroup-debug.c	2023-04-11 10:21:02.296270333 -0400
++@@ -21,6 +21,9 @@
++ #include <stdio.h>
++ #include <stdlib.h>
++ 
+++void print_indent (FILE        *stream,
+++                   unsigned int indent);
+++
++ void netgroup_debug_print_entry(struct entry *entry, FILE *stream, unsigned int indent) {
++   print_indent(stream, indent);
++ 
+-- 
+GitLab
+
diff --git a/meta-gnome/recipes-support/accountsservice/accountsservice_22.08.8.bb b/meta-gnome/recipes-support/accountsservice/accountsservice_23.13.9.bb
similarity index 79%
rename from meta-gnome/recipes-support/accountsservice/accountsservice_22.08.8.bb
rename to meta-gnome/recipes-support/accountsservice/accountsservice_23.13.9.bb
index 439958c7d2..ba8c4f24d7 100644
--- a/meta-gnome/recipes-support/accountsservice/accountsservice_22.08.8.bb
+++ b/meta-gnome/recipes-support/accountsservice/accountsservice_23.13.9.bb
@@ -12,12 +12,15 @@  inherit meson gobject-introspection gtk-doc features_check systemd vala
 
 REQUIRED_DISTRO_FEATURES = "polkit"
 
-SRC_URI = "https://www.freedesktop.org/software/${BPN}/${BPN}-${PV}.tar.xz"
+SRC_URI = " \
+	https://www.freedesktop.org/software/${BPN}/${BPN}-${PV}.tar.xz \
+	file://accountsservice-23.13.9-c99-fixes.patch \
+"
 SRC_URI:append:libc-musl = " \
     file://0001-musl-Hack-to-fix-build.patch \
     file://0002-musl-add-missing-fgetspent_r.patch \
 "
-SRC_URI[sha256sum] = "909997a76919fe7dc138a9a01cea70bd622d5a932dbc9fb13010113023a7a391"
+SRC_URI[sha256sum] = "adda4cdeae24fa0992e7df3ffff9effa7090be3ac233a3edfdf69d5a9c9b924f"
 
 GTKDOC_MESON_OPTION = "gtk_doc"