Gentoo Archives: gentoo-commits

From: David Seifert <soap@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: dev-python/pkgconfig/, dev-python/pkgconfig/files/
Date: Wed, 30 Jun 2021 08:23:24
Message-Id: 1625041376.22e842e727e7ca3827b79f22eb7b8bed5bc59eae.soap@gentoo
1 commit: 22e842e727e7ca3827b79f22eb7b8bed5bc59eae
2 Author: David Seifert <soap <AT> gentoo <DOT> org>
3 AuthorDate: Wed Jun 30 08:22:56 2021 +0000
4 Commit: David Seifert <soap <AT> gentoo <DOT> org>
5 CommitDate: Wed Jun 30 08:22:56 2021 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=22e842e7
7
8 dev-python/pkgconfig: Fix brittle test sorting order
9
10 Closes: https://bugs.gentoo.org/799290
11 Package-Manager: Portage-3.0.20, Repoman-3.0.3
12 Signed-off-by: David Seifert <soap <AT> gentoo.org>
13
14 .../pkgconfig/files/pkgconfig-1.5.4-brittle-tests.patch | 14 ++++++++++++++
15 dev-python/pkgconfig/pkgconfig-1.5.4.ebuild | 2 ++
16 2 files changed, 16 insertions(+)
17
18 diff --git a/dev-python/pkgconfig/files/pkgconfig-1.5.4-brittle-tests.patch b/dev-python/pkgconfig/files/pkgconfig-1.5.4-brittle-tests.patch
19 new file mode 100644
20 index 00000000000..05ba21f22ac
21 --- /dev/null
22 +++ b/dev-python/pkgconfig/files/pkgconfig-1.5.4-brittle-tests.patch
23 @@ -0,0 +1,14 @@
24 +--- a/test_pkgconfig.py
25 ++++ b/test_pkgconfig.py
26 +@@ -138,9 +138,9 @@
27 + def test_configure_extension():
28 + ext = Extension('foo', ['foo.c'])
29 + pkgconfig.configure_extension(ext, 'fake-gtk+-3.0 fake-python')
30 +- assert ext.extra_compile_args == [
31 ++ assert sorted(ext.extra_compile_args) == [
32 + '-DGSEAL_ENABLE', '-I/usr/include/gtk-3.0','-I/usr/include/python2.7']
33 +- assert ext.extra_link_args == [
34 ++ assert sorted(ext.extra_link_args) == [
35 + '-L/usr/lib_gtk_foo', '-L/usr/lib_python_foo', '-lgtk-3', '-lpython2.7']
36 +
37 +
38
39 diff --git a/dev-python/pkgconfig/pkgconfig-1.5.4.ebuild b/dev-python/pkgconfig/pkgconfig-1.5.4.ebuild
40 index 086dfe2434c..d4c0fd9d2b3 100644
41 --- a/dev-python/pkgconfig/pkgconfig-1.5.4.ebuild
42 +++ b/dev-python/pkgconfig/pkgconfig-1.5.4.ebuild
43 @@ -18,3 +18,5 @@ KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux"
44 RDEPEND="virtual/pkgconfig"
45
46 distutils_enable_tests pytest
47 +
48 +PATCHES=( "${FILESDIR}"/${P}-brittle-tests.patch )