gentoo auto-resync : 04:05:2024 - 00:00:19

4 files changed, 98 insertions, 3 deletions

diff --git a/sys-apps/accountsservice/Manifest b/sys-apps/accountsservice/Manifest
index 4ad1b7a2593d..c7cf9fda3936 100644
--- a/sys-apps/accountsservice/Manifest
+++ b/sys-apps/accountsservice/Manifest
@@ -1,6 +1,8 @@
 AUX accountsservice-22.04.62-gentoo-system-users.patch 1318 BLAKE2B 69c74ad620cebd6864efff7ad87401a72ea5f644a773a682653b45584e34755aaf12a0e79ba816c990b0af2784d01fec5e8b657699ecfc7c38343330a36fda57 SHA512 a85a6ca785a3863d96eae39bc3eee5fe89bedd0bdae40cd6bc2e077bb88f72d73d0be63dcf0e0a788f0f5d69ed39801c9ede623afe8ed08c94372314b1fddd09
+AUX accountsservice-23.13.9-c99-fixes.patch 2036 BLAKE2B 04c3e7014ac34751754756a0df9bdb8782a1020575fa1bd842ce377be0663d7267442540c85535e167a74479f7a35cf764dd3c6f0de5a143d8983dc303684aa7 SHA512 3ec9c0a780b0293b907a5e51721601c997ea1be3773ab932edacda2aeb0d67659dcbbcc807099c01c3e402b2e708534c0527e3eab4d2b96cba7850087737075f
 AUX accountsservice-23.13.9-generate-version.patch 1156 BLAKE2B e5b464ac3a15f089dbaa2b687a91126af002370b8be30e5b5f77a2528620c100569bb96bc75be86b69753a161d09c4d6ba803352047343cf454f79798d302fa1 SHA512 b288368df675bb82a083c9ea94df53e3789ca824d174b10dccd50a3996983f7284b059ea646e42a00b03723ea13c54a67ef032112ac4f61d0b6740698fbed790
 AUX accountsservice-23.13.9-musl-fixes.patch 1939 BLAKE2B f8384ced0320f11778cb3403dfae2952bee34970565f740b5a93d7a720336f42f891d5628c719a04276890c0f5ec0679211eb5cf1332c328e2a2be349de7800e SHA512 60c818dfbfd3869a65e6d309bb2db71af65e3241b23aedf93ae6334e2dbc764cc03d244d2a73f11082f9521cdb2306ad3d8f6e7d8cab1b509a55fedfa1198ed8
+AUX accountsservice-23.13.9-test-fix.patch 1683 BLAKE2B bf0f628652d584cb8987744869063b71a78203bec6bb6727598eb9f4b1c9016122768ce2f6a0c5178f21c029d2fa1ba539bc98f21ca400025390ce0335026ee0 SHA512 895c25a8d038c385fe927f43570185b28b5c3b6a6ae2762433f4d683ac19b9f725dafbe9a43dcf51cd24e037f071040c81161930620280382886b99106c2a5c1
 DIST accountsservice-23.13.9.tar.xz 636064 BLAKE2B 74dbbe816937e626ba0f6524b4293466ac2905f474396f5d23633e966d46e013de110671abcbfe2911fffa1e98872e2525b61594a967f917975ebf18d39b8547 SHA512 c6eb543ce2e07b61bbdfa454e388949bc688517be0536b14f30c66383ed105b15d3fab8b6c62b1eaa08f67d9bdc29b928729d9f7c704f47de4decf0de8e12f89
-EBUILD accountsservice-23.13.9.ebuild 2386 BLAKE2B 0c2f0400fc40810ae6d2e97dfe069e722930b7ee5fa545229c17b52786322f85ed6077c8599dfb44efb1e8c8642502b725ee07197c3ffb32be3be746aa3ca016 SHA512 aa2c83691a376329762fb97e18d89953b800dbbc127b0d7d128ded6eba7179062b1d3ff7e6956aadd72900b53900f9f6111610b070fee97eecbd871af9da520e
+EBUILD accountsservice-23.13.9.ebuild 2483 BLAKE2B ff44580977046464032aa34945d498110f327da07d4890fbb9c1dba21ce367a9f5e2e2280066b1fdf1efa204311b373b78b9592417e857a28348ffbc03f28204 SHA512 68599eae2d2841aa65ce2abeff622b230f9f8631ff8604b581268c49e4b665fc83e245595f822951b0568f4a47889ef75930906d7910943a93caf6d2a5bbaddc
 MISC metadata.xml 559 BLAKE2B c43012a95ec8ddd3ce687f69b4dc1889c82f31828f8e1f53bded7723b82c2a8faff594674fbd819370078dc13f48f51df45a3a280563c6a00080e5332128498c SHA512 6c1e1e291bcd11a06fe4e7b73031accdf0fe839cb7372f96d1cc52e5c1a1a1b032adcf0da7dde016331fefcb1ae1402386ba3ab2713b4256e9e60dd2b73f76f5
diff --git a/sys-apps/accountsservice/accountsservice-23.13.9.ebuild b/sys-apps/accountsservice/accountsservice-23.13.9.ebuild
index 61e932e21ed9..af4e0ea9c6ee 100644
--- a/sys-apps/accountsservice/accountsservice-23.13.9.ebuild
+++ b/sys-apps/accountsservice/accountsservice-23.13.9.ebuild
@@ -1,8 +1,8 @@
-# Copyright 2011-2023 Gentoo Authors
+# Copyright 2011-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
-PYTHON_COMPAT=( python3_{9..11} )
+PYTHON_COMPAT=( python3_{9..12} )
 inherit meson python-any-r1 systemd
 
 DESCRIPTION="D-Bus interfaces for querying and manipulating user account information"
@@ -58,6 +58,8 @@ PATCHES=(
 	# From Alpine Linux
 	# https://gitlab.freedesktop.org/accountsservice/accountsservice/-/merge_requests/97
 	"${FILESDIR}"/${PN}-23.13.9-musl-fixes.patch
+	"${FILESDIR}"/${PN}-23.13.9-c99-fixes.patch #930715
+	"${FILESDIR}"/${PN}-23.13.9-test-fix.patch
 )
 
 python_check_deps() {
diff --git a/sys-apps/accountsservice/files/accountsservice-23.13.9-c99-fixes.patch b/sys-apps/accountsservice/files/accountsservice-23.13.9-c99-fixes.patch
new file mode 100644
index 000000000000..28f82fc5a87f
--- /dev/null
+++ b/sys-apps/accountsservice/files/accountsservice-23.13.9-c99-fixes.patch
@@ -0,0 +1,50 @@
+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.
+---
+ 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/sys-apps/accountsservice/files/accountsservice-23.13.9-test-fix.patch b/sys-apps/accountsservice/files/accountsservice-23.13.9-test-fix.patch
new file mode 100644
index 000000000000..a0f8346ce802
--- /dev/null
+++ b/sys-apps/accountsservice/files/accountsservice-23.13.9-test-fix.patch
@@ -0,0 +1,41 @@
+https://gitlab.freedesktop.org/accountsservice/accountsservice/-/commit/ad0365b77b583da06bcd1e8da4c1bed74129895a
+
+From ad0365b77b583da06bcd1e8da4c1bed74129895a Mon Sep 17 00:00:00 2001
+From: Ray Strode <rstrode@redhat.com>
+Date: Thu, 28 Sep 2023 09:29:07 -0400
+Subject: [PATCH] tests: s/assertEquals/assertEqual/
+
+CI is currently failing with:
+
+Traceback (most recent call last):
+  File "/home/user/accountsservice/_build/../tests/test-libaccountsservice.py", line 118, in test_multiple_inflight_get_user_by_id_calls
+    self.assertEquals(user.get_user_name(), 'pizza')
+    ^^^^^^^^^^^^^^^^^
+AttributeError: 'TestAccountsServicePreExistingUser' object has no attribute 'assertEquals'. Did you mean: 'assertEqual'?
+
+I have no idea if assertEquals was dropped, or if CI has been failing
+all this time or what.
+
+This commit makes the suggested change.
+---
+ tests/test-libaccountsservice.py | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/tests/test-libaccountsservice.py b/tests/test-libaccountsservice.py
+index f0261b1..f2fcbc2 100644
+--- a/tests/test-libaccountsservice.py
++++ b/tests/test-libaccountsservice.py
+@@ -115,8 +115,8 @@ class TestAccountsServicePreExistingUser(AccountsServiceTestBase):
+             self.assertTrue(user_objects[instance].is_loaded())
+ 
+         for user in user_objects:
+-            self.assertEquals(user.get_user_name(), 'pizza')
+-            self.assertEquals(user.get_uid(), 2001)
++            self.assertEqual(user.get_user_name(), 'pizza')
++            self.assertEqual(user.get_uid(), 2001)
+ 
+ @unittest.skipUnless(have_accounts_service,
+                      'AccountsService gi introspection not available')
+-- 
+GitLab
+