1 |
commit: 449ff656f92846237d68ae3f27b3ab2aedd62da8 |
2 |
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
3 |
AuthorDate: Sat Oct 24 15:42:07 2020 +0000 |
4 |
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
5 |
CommitDate: Sun Oct 25 00:27:39 2020 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=449ff656 |
7 |
|
8 |
net-libs/libaccounts-glib: python3_9, fix assert failure |
9 |
|
10 |
Package-Manager: Portage-3.0.8, Repoman-3.0.2 |
11 |
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org> |
12 |
|
13 |
.../libaccounts-glib-1.25-assert-failure.patch | 26 +++++++++ |
14 |
.../libaccounts-glib-1.25-r2.ebuild | 62 ++++++++++++++++++++++ |
15 |
2 files changed, 88 insertions(+) |
16 |
|
17 |
diff --git a/net-libs/libaccounts-glib/files/libaccounts-glib-1.25-assert-failure.patch b/net-libs/libaccounts-glib/files/libaccounts-glib-1.25-assert-failure.patch |
18 |
new file mode 100644 |
19 |
index 00000000000..f35aee5c6a8 |
20 |
--- /dev/null |
21 |
+++ b/net-libs/libaccounts-glib/files/libaccounts-glib-1.25-assert-failure.patch |
22 |
@@ -0,0 +1,26 @@ |
23 |
+From 29bdc47abe11d3bfcec7a35ed83475eba04bfdaa Mon Sep 17 00:00:00 2001 |
24 |
+From: Pekka Vuorela <pekka.vuorela@×××××.com> |
25 |
+Date: Tue, 7 Jul 2020 12:51:50 +0300 |
26 |
+Subject: [PATCH] Avoid assert failure on ag_provider_get_tags |
27 |
+ |
28 |
+--- |
29 |
+ libaccounts-glib/ag-provider.c | 3 +++ |
30 |
+ 1 file changed, 3 insertions(+) |
31 |
+ |
32 |
+diff --git a/libaccounts-glib/ag-provider.c b/libaccounts-glib/ag-provider.c |
33 |
+index 93d1541..8a79616 100644 |
34 |
+--- a/libaccounts-glib/ag-provider.c |
35 |
++++ b/libaccounts-glib/ag-provider.c |
36 |
+@@ -464,6 +464,9 @@ GList *ag_provider_get_tags (AgProvider *provider) |
37 |
+ { |
38 |
+ g_return_val_if_fail (provider != NULL, NULL); |
39 |
+ |
40 |
++ if (G_UNLIKELY (provider->tags == NULL)) |
41 |
++ return NULL; |
42 |
++ |
43 |
+ return g_hash_table_get_keys (provider->tags); |
44 |
+ } |
45 |
+ |
46 |
+-- |
47 |
+GitLab |
48 |
+ |
49 |
|
50 |
diff --git a/net-libs/libaccounts-glib/libaccounts-glib-1.25-r2.ebuild b/net-libs/libaccounts-glib/libaccounts-glib-1.25-r2.ebuild |
51 |
new file mode 100644 |
52 |
index 00000000000..7b08a98a220 |
53 |
--- /dev/null |
54 |
+++ b/net-libs/libaccounts-glib/libaccounts-glib-1.25-r2.ebuild |
55 |
@@ -0,0 +1,62 @@ |
56 |
+# Copyright 1999-2020 Gentoo Authors |
57 |
+# Distributed under the terms of the GNU General Public License v2 |
58 |
+ |
59 |
+EAPI=7 |
60 |
+ |
61 |
+PYTHON_COMPAT=( python3_{7,8,9} ) |
62 |
+inherit meson python-r1 vala |
63 |
+ |
64 |
+DESCRIPTION="Accounts SSO (Single Sign-On) management library for GLib applications" |
65 |
+HOMEPAGE="https://gitlab.com/accounts-sso/libaccounts-glib" |
66 |
+SRC_URI="https://gitlab.com/accounts-sso/${PN}/-/archive/VERSION_${PV}/${PN}-VERSION_${PV}.tar.gz -> ${P}.tar.gz" |
67 |
+ |
68 |
+LICENSE="LGPL-2.1" |
69 |
+SLOT="0" |
70 |
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86" |
71 |
+IUSE="doc" |
72 |
+ |
73 |
+REQUIRED_USE="${PYTHON_REQUIRED_USE}" |
74 |
+ |
75 |
+RDEPEND="${PYTHON_DEPS} |
76 |
+ dev-db/sqlite:3 |
77 |
+ dev-libs/glib:2 |
78 |
+ dev-libs/gobject-introspection:= |
79 |
+ dev-libs/libxml2 |
80 |
+ dev-python/pygobject:3[${PYTHON_USEDEP}] |
81 |
+" |
82 |
+DEPEND="${RDEPEND}" |
83 |
+BDEPEND=" |
84 |
+ $(vala_depend) |
85 |
+ dev-util/gdbus-codegen |
86 |
+ dev-util/glib-utils |
87 |
+ dev-libs/check |
88 |
+ doc? ( dev-util/gtk-doc ) |
89 |
+" |
90 |
+ |
91 |
+# fails |
92 |
+RESTRICT="test" |
93 |
+ |
94 |
+S="${WORKDIR}/${PN}-VERSION_${PV}" |
95 |
+ |
96 |
+PATCHES=( "${FILESDIR}/${P}-assert-failure.patch" ) |
97 |
+ |
98 |
+src_prepare() { |
99 |
+ default |
100 |
+ vala_src_prepare --ignore-use |
101 |
+ |
102 |
+ use doc || sed -e "/^subdir('docs')$/d" -i meson.build || die |
103 |
+} |
104 |
+ |
105 |
+src_configure() { |
106 |
+ python_foreach_impl run_in_build_dir meson_src_configure |
107 |
+} |
108 |
+ |
109 |
+src_compile() { |
110 |
+ python_foreach_impl run_in_build_dir meson_src_compile |
111 |
+} |
112 |
+ |
113 |
+src_install() { |
114 |
+ einstalldocs |
115 |
+ python_foreach_impl run_in_build_dir meson_src_install |
116 |
+ python_foreach_impl python_optimize |
117 |
+} |