gentoo auto-resync : 25:10:2022 - 21:54:27

3 files changed, 42 insertions, 8 deletions

diff --git a/net-libs/libaccounts-glib/Manifest b/net-libs/libaccounts-glib/Manifest
index f65e29d28a8c..a31e39c56d7f 100644
--- a/net-libs/libaccounts-glib/Manifest
+++ b/net-libs/libaccounts-glib/Manifest
@@ -1,7 +1,7 @@
 AUX libaccounts-glib-1.25-assert-failure.patch 743 BLAKE2B 5f0ebe2754f4d0b03bfabfb83e3c7fbb3f54f117a1548275e8f974d43c92aeaadbae6c22d909127aa4a8c47e806a26f19e6ae598f30c5f34e3e2b48b3a7ff8be SHA512 4a483a915fc72efa42c10947cc399f30f2825a8f2bd59d88afec5da9cb29346572ba80c316ca4de4b21132e8ad34e031cdd735cb3ed0767d51780a15ac086fd7
+AUX libaccounts-glib-1.26-fix-incorrect-cleanup-in-ag_account_finalize.patch 1150 BLAKE2B c41449bddae028fb6a444a2d49884c7c53170494ed4fd699b589990a462f67112dc1f3c4359d26b39613456f6e9b5650db97fea39a90e87c007074c791d53b74 SHA512 76f99833910ce5095a3ccb09404ce371e95e40dc4e712a4cc3bdc0046c5a32693ff093956c73dcab9636f35fc83db8c361126ad1623c927cd525f94ffcaf941f
 AUX libaccounts-glib-1.26-project-version.patch 350 BLAKE2B 6a2115cd408e425e94b637e029f22ab9ada2739bcf29b7e20e80dfc89e571666f5ad909f5f89e7476d4456c9b2e4ad67287df1aacff86ffe8817a66360717871 SHA512 7755e629309017f69c4c9daf71b3df578739970c06d0193009d0bddaa659b5cbe3531b75d95e36cfbe957134aa9eee3707e8d6f9a5a23676f538c49fedfce429
-DIST libaccounts-glib-1.25.tar.gz 117337 BLAKE2B 72e6e15b63eea4d5b2a3e994779a4636bee859c6d395c8c9f65120cfee1c25a5708971b438010f668eefee20735b01e9f9f4e1ac4cb55495a06143d20198e422 SHA512 cc8b493d246f99300ee614fed93258378ecdbe9c518a958a59827ee8f74559b1ee3683acfb85f59aa91390275497fb35041da2be47f27f24f96e1efd5d6d2e20
 DIST libaccounts-glib-1.26.tar.gz 117365 BLAKE2B a3c7bf4058372001079c9c153b30f947882521f1f9680a63db2883307e998335a1e646112dc8a51640824f238d871d96da2c18b4ef175c837cebfe056ded2cbb SHA512 c08a11087745ba771e539b61de57693390960ad6b4e8217c159be49d31bd7f8856fffa835e7a230f352049bbf7cec9184ff225e74bbc195964221d3d9d49743b
-EBUILD libaccounts-glib-1.25-r2.ebuild 1377 BLAKE2B 6f92032e8467af5353c292bab1f033c5330f3596d2796027383ee2cd8fb14ae4438b62a15983f6d507948b5ef4a745ee32fa6112d40481a1329f9d14a57d46f5 SHA512 56636736f9e04190e2ffd57f2f442ca4ee1b12c3b6c9e39b5e4af44bc609344aafbc10ce6b7b724520d12050a0ec8275bbae37086c3ac3e83e9e7ec921aca9ab
+EBUILD libaccounts-glib-1.26-r1.ebuild 1490 BLAKE2B b9e7428445952157636322c0f3214aff2ef78157ee90c74dc414079a7cb49cf912fff5e0a8e2afb960f6f349b20e095ca6b6f36f36aca71ec11323b6787eab04 SHA512 5ed067e7b17fdc82cf8fdf3340773efac6af033c8111eff589a46729cccd6f2414d2e6249311bbd3efcc55c41cbd1ab801d862b07133da5acd85db8099981a1a
 EBUILD libaccounts-glib-1.26.ebuild 1418 BLAKE2B 7dc205283363854d36b6ff957b13ee4b2033ae210c257a790afdbde4aab5ec814b24f0333d1d8eaa860e3bd90b81fb5c5bd3a489a70908385984cae68772f3e6 SHA512 613812328f776618447e26cbf9ee7b97238209a7fcfb267cfe7829913a26cb7d22ee086cbf42d28dc8928bab550ac89c85f2008544d59f10254d2ed816441309
 MISC metadata.xml 250 BLAKE2B f3e9395137ebb9adf46cd35c1b6156f82c04cfa94f964f6da24fe71eb560cf51b4f70ebfa10daaa4884400ec22782d819ab794dfd29e7a47559f07208397195d SHA512 78c4ff15eed76ba883b457be95dabd41e928a0e64a42b758b5eab4d8a95afca27d5ea6a7cfe0948de578b169153a05f08aadfce1ddd41a88732212a1e76e565f
diff --git a/net-libs/libaccounts-glib/files/libaccounts-glib-1.26-fix-incorrect-cleanup-in-ag_account_finalize.patch b/net-libs/libaccounts-glib/files/libaccounts-glib-1.26-fix-incorrect-cleanup-in-ag_account_finalize.patch
new file mode 100644
index 000000000000..0a6f1120882a
--- /dev/null
+++ b/net-libs/libaccounts-glib/files/libaccounts-glib-1.26-fix-incorrect-cleanup-in-ag_account_finalize.patch
@@ -0,0 +1,30 @@
+From 270a66d5efe1453a2be4bad10894b947fdd2923e Mon Sep 17 00:00:00 2001
+From: Alberto Mardegan <mardy@users.sourceforge.net>
+Date: Tue, 4 Oct 2022 20:58:27 +0300
+Subject: [PATCH] ag-account: fix incorrect cleanup in ag_account_finalize
+
+The wrong variable was passed to _ag_account_changes_free(); as a matter
+of facts, this code was always a NOP, since prig->services had already
+been nullified before, but it was a memory leak.
+
+Fixes: https://gitlab.com/accounts-sso/libaccounts-glib/-/issues/13
+---
+ libaccounts-glib/ag-account.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/libaccounts-glib/ag-account.c b/libaccounts-glib/ag-account.c
+index 8d6995b..7e67ba7 100644
+--- a/libaccounts-glib/ag-account.c
++++ b/libaccounts-glib/ag-account.c
+@@ -994,7 +994,7 @@ ag_account_finalize (GObject *object)
+     if (priv->changes)
+     {
+         DEBUG_INFO ("Finalizing account with uncommitted changes!");
+-        g_clear_pointer (&priv->services, _ag_account_changes_free);
++        g_clear_pointer (&priv->changes, _ag_account_changes_free);
+     }
+ 
+     G_OBJECT_CLASS (ag_account_parent_class)->finalize (object);
+-- 
+GitLab
+
diff --git a/net-libs/libaccounts-glib/libaccounts-glib-1.25-r2.ebuild b/net-libs/libaccounts-glib/libaccounts-glib-1.26-r1.ebuild
index 5d6c6cb80b40..8ba1dce7b289 100644
--- a/net-libs/libaccounts-glib/libaccounts-glib-1.25-r2.ebuild
+++ b/net-libs/libaccounts-glib/libaccounts-glib-1.26-r1.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
-PYTHON_COMPAT=( python3_{7,8,9,10} )
+PYTHON_COMPAT=( python3_{8..11} )
 inherit meson python-r1 vala
 
 DESCRIPTION="Accounts SSO (Single Sign-On) management library for GLib applications"
@@ -13,7 +13,7 @@ S="${WORKDIR}/${PN}-VERSION_${PV}"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ~loong ~ppc64 ~riscv x86"
+KEYWORDS="~amd64 ~arm arm64 ~loong ~ppc64 ~riscv ~x86"
 IUSE="doc"
 
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
@@ -30,17 +30,21 @@ RDEPEND="${PYTHON_DEPS}
 DEPEND="${RDEPEND}"
 BDEPEND="
 	$(vala_depend)
+	dev-libs/check
 	dev-util/gdbus-codegen
 	dev-util/glib-utils
-	dev-libs/check
 	doc? ( dev-util/gtk-doc )
 "
 
-PATCHES=( "${FILESDIR}/${P}-assert-failure.patch" )
+PATCHES=(
+	"${FILESDIR}/${PN}-1.25-assert-failure.patch"
+	"${FILESDIR}/${P}-project-version.patch"
+	"${FILESDIR}/${P}-fix-incorrect-cleanup-in-ag_account_finalize.patch"
+)
 
 src_prepare() {
 	default
-	vala_src_prepare --ignore-use
+	vala_setup --ignore-use
 
 	use doc || sed -e "/^subdir('docs')$/d" -i meson.build || die
 }