Gentoo Archives: gentoo-commits

From: Alessandro Barbieri <lssndrbarbieri@×××××.com>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/proj/guru:dev commit in: dev-python/uharfbuzz/, dev-python/uharfbuzz/files/
Date: Thu, 07 Oct 2021 10:22:51
Message-Id: 1633602165.9464fb48f636b5346fdf50eadd047ff393f0ed6d.Alessandro-Barbieri@gentoo
1 commit: 9464fb48f636b5346fdf50eadd047ff393f0ed6d
2 Author: Alessandro Barbieri <lssndrbarbieri <AT> gmail <DOT> com>
3 AuthorDate: Thu Oct 7 10:21:42 2021 +0000
4 Commit: Alessandro Barbieri <lssndrbarbieri <AT> gmail <DOT> com>
5 CommitDate: Thu Oct 7 10:22:45 2021 +0000
6 URL: https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=9464fb48
7
8 dev-python/uharfbuzz: fix build
9
10 Closes: https://bugs.gentoo.org/816720
11 Package-Manager: Portage-3.0.28, Repoman-3.0.3
12 Signed-off-by: Alessandro Barbieri <lssndrbarbieri <AT> gmail.com>
13
14 .../files/uharfbuzz-0.18.0-system-harfbuzz.patch | 31 ++++++++++++++++++++++
15 dev-python/uharfbuzz/uharfbuzz-0.18.0.ebuild | 2 +-
16 2 files changed, 32 insertions(+), 1 deletion(-)
17
18 diff --git a/dev-python/uharfbuzz/files/uharfbuzz-0.18.0-system-harfbuzz.patch b/dev-python/uharfbuzz/files/uharfbuzz-0.18.0-system-harfbuzz.patch
19 new file mode 100644
20 index 000000000..93f0c7058
21 --- /dev/null
22 +++ b/dev-python/uharfbuzz/files/uharfbuzz-0.18.0-system-harfbuzz.patch
23 @@ -0,0 +1,31 @@
24 +--- a/setup.py
25 ++++ b/setup.py
26 +@@ -13,7 +13,7 @@
27 + with open(os.path.join(here, 'README.md'), encoding='utf-8') as f:
28 + long_description = f.read()
29 +
30 +-define_macros = [('HB_NO_MT', '1'), ('HB_EXPERIMENTAL_API', '1')]
31 ++define_macros = [('HB_EXPERIMENTAL_API', '1')]
32 + linetrace = False
33 + if int(os.environ.get('CYTHON_LINETRACE', '0')):
34 + linetrace = True
35 +@@ -21,7 +21,7 @@
36 +
37 + extra_compile_args = []
38 + extra_link_args = []
39 +-libraries = []
40 ++libraries=['harfbuzz']
41 + if platform.system() != 'Windows':
42 + extra_compile_args.append('-std=c++11')
43 + define_macros.append(('HAVE_MMAP', '1'))
44 +@@ -39,8 +39,8 @@
45 + extension = Extension(
46 + 'uharfbuzz._harfbuzz',
47 + define_macros=define_macros,
48 +- include_dirs=['harfbuzz/src'],
49 +- sources=['src/uharfbuzz/_harfbuzz.pyx', 'harfbuzz/src/harfbuzz.cc'],
50 ++ include_dirs=['/usr/include/harfbuzz'],
51 ++ sources=['src/uharfbuzz/_harfbuzz.pyx'],
52 + language='c++',
53 + libraries=libraries,
54 + extra_compile_args=extra_compile_args,
55
56 diff --git a/dev-python/uharfbuzz/uharfbuzz-0.18.0.ebuild b/dev-python/uharfbuzz/uharfbuzz-0.18.0.ebuild
57 index 5e1529f95..f58cb51b3 100644
58 --- a/dev-python/uharfbuzz/uharfbuzz-0.18.0.ebuild
59 +++ b/dev-python/uharfbuzz/uharfbuzz-0.18.0.ebuild
60 @@ -23,7 +23,7 @@ DEPEND="
61 dev-python/cython[${PYTHON_USEDEP}]
62 "
63
64 -PATCHES=( "${FILESDIR}/${PN}-0.16.1-system-harfbuzz.patch" )
65 +PATCHES=( "${FILESDIR}/${P}-system-harfbuzz.patch" )
66
67 distutils_enable_tests pytest