From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 229D6158064 for ; Fri, 3 May 2024 11:03:12 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id B25392BC016; Fri, 3 May 2024 11:03:10 +0000 (UTC) Received: from smtp.gentoo.org (mail.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 4680C2BC016 for ; Fri, 3 May 2024 11:03:10 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 7EB49343084 for ; Fri, 3 May 2024 11:03:09 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id B6CC519DB for ; Fri, 3 May 2024 11:03:07 +0000 (UTC) From: "Sam James" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Sam James" Message-ID: <1714734104.0256d3a4f144f63a702c1ad0147f7adf31436b3d.sam@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: sys-apps/accountsservice/, sys-apps/accountsservice/files/ X-VCS-Repository: repo/gentoo X-VCS-Files: sys-apps/accountsservice/accountsservice-23.13.9.ebuild sys-apps/accountsservice/files/accountsservice-23.13.9-c99-fixes.patch sys-apps/accountsservice/files/accountsservice-23.13.9-test-fix.patch X-VCS-Directories: sys-apps/accountsservice/ sys-apps/accountsservice/files/ X-VCS-Committer: sam X-VCS-Committer-Name: Sam James X-VCS-Revision: 0256d3a4f144f63a702c1ad0147f7adf31436b3d X-VCS-Branch: master Date: Fri, 3 May 2024 11:03:07 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 172c2762-11a3-4dab-abbc-2f62d116799e X-Archives-Hash: faabd8039302242c39310445a0a3d106 commit: 0256d3a4f144f63a702c1ad0147f7adf31436b3d Author: Kostadin Shishmanov tutanota com> AuthorDate: Fri Apr 26 17:42:19 2024 +0000 Commit: Sam James gentoo org> CommitDate: Fri May 3 11:01:44 2024 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0256d3a4 sys-apps/accountsservice: enable py3.12, c99 porting, backport test fix Closes: https://bugs.gentoo.org/929806 Closes: https://bugs.gentoo.org/930715 Signed-off-by: Kostadin Shishmanov tutanota.com> Closes: https://github.com/gentoo/gentoo/pull/36440 Signed-off-by: Sam James gentoo.org> .../accountsservice/accountsservice-23.13.9.ebuild | 6 ++- .../files/accountsservice-23.13.9-c99-fixes.patch | 50 ++++++++++++++++++++++ .../files/accountsservice-23.13.9-test-fix.patch | 41 ++++++++++++++++++ 3 files changed, 95 insertions(+), 2 deletions(-) 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 +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 ++ #include ++ +++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 +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 +