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: Sun, 27 Mar 2022 07:31:00
Message-Id: 1648366245.7ed29483c6c4649080523a7a12a41fef8e5d8827.Alessandro-Barbieri@gentoo
1 commit: 7ed29483c6c4649080523a7a12a41fef8e5d8827
2 Author: Alessandro Barbieri <lssndrbarbieri <AT> gmail <DOT> com>
3 AuthorDate: Sun Mar 27 06:27:05 2022 +0000
4 Commit: Alessandro Barbieri <lssndrbarbieri <AT> gmail <DOT> com>
5 CommitDate: Sun Mar 27 07:30:45 2022 +0000
6 URL: https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=7ed29483
7
8 dev-python/uharfbuzz: fix patch
9
10 Closes: https://bugs.gentoo.org/836221
11 Signed-off-by: Alessandro Barbieri <lssndrbarbieri <AT> gmail.com>
12
13 .../files/uharfbuzz-0.23.0-system-harfbuzz.patch | 25 ++++++++++++++++++++++
14 dev-python/uharfbuzz/uharfbuzz-0.23.0.ebuild | 2 +-
15 2 files changed, 26 insertions(+), 1 deletion(-)
16
17 diff --git a/dev-python/uharfbuzz/files/uharfbuzz-0.23.0-system-harfbuzz.patch b/dev-python/uharfbuzz/files/uharfbuzz-0.23.0-system-harfbuzz.patch
18 new file mode 100644
19 index 000000000..08b9f6549
20 --- /dev/null
21 +++ b/dev-python/uharfbuzz/files/uharfbuzz-0.23.0-system-harfbuzz.patch
22 @@ -0,0 +1,25 @@
23 +--- a/setup.py
24 ++++ b/setup.py
25 +@@ -13,7 +13,7 @@
26 + with open(os.path.join(here, 'README.md'), encoding='utf-8') as f:
27 + long_description = f.read()
28 +
29 +-define_macros = [('HB_NO_MT', '1'), ('HB_EXPERIMENTAL_API', '1')]
30 ++define_macros = [('HB_EXPERIMENTAL_API', '1')]
31 + linetrace = False
32 + if int(os.environ.get('CYTHON_LINETRACE', '0')):
33 + linetrace = True
34 +@@ -39,11 +39,9 @@
35 + extension = Extension(
36 + 'uharfbuzz._harfbuzz',
37 + define_macros=define_macros,
38 +- include_dirs=['harfbuzz/src'],
39 ++ include_dirs=['/usr/include/harfbuzz'],
40 + sources=[
41 +- 'src/uharfbuzz/_harfbuzz.pyx',
42 +- 'harfbuzz/src/harfbuzz.cc',
43 +- 'harfbuzz/src/hb-subset-repacker.cc',
44 ++ 'src/uharfbuzz/_harfbuzz.pyx'
45 + ],
46 + language='c++',
47 + libraries=libraries,
48
49 diff --git a/dev-python/uharfbuzz/uharfbuzz-0.23.0.ebuild b/dev-python/uharfbuzz/uharfbuzz-0.23.0.ebuild
50 index 90c61b347..878a48110 100644
51 --- a/dev-python/uharfbuzz/uharfbuzz-0.23.0.ebuild
52 +++ b/dev-python/uharfbuzz/uharfbuzz-0.23.0.ebuild
53 @@ -24,7 +24,7 @@ DEPEND="
54 >=dev-python/wheel-0.31[${PYTHON_USEDEP}]
55 "
56
57 -PATCHES=( "${FILESDIR}/${PN}-0.18.0-system-harfbuzz.patch" )
58 +PATCHES=( "${FILESDIR}/${P}-system-harfbuzz.patch" )
59
60 distutils_enable_tests pytest