1 |
commit: d0561436959182dc1b04f68822647e637a6f927f |
2 |
Author: Alessandro Barbieri <lssndrbarbieri <AT> gmail <DOT> com> |
3 |
AuthorDate: Tue Mar 29 08:41:10 2022 +0000 |
4 |
Commit: Alessandro Barbieri <lssndrbarbieri <AT> gmail <DOT> com> |
5 |
CommitDate: Tue Mar 29 08:44:51 2022 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=d0561436 |
7 |
|
8 |
dev-python/uharfbuzz: fix patch, no optimize |
9 |
|
10 |
Closes: https://bugs.gentoo.org/835473 |
11 |
Closes: https://bugs.gentoo.org/836356 |
12 |
Signed-off-by: Alessandro Barbieri <lssndrbarbieri <AT> gmail.com> |
13 |
|
14 |
dev-python/uharfbuzz/Manifest | 1 - |
15 |
.../files/uharfbuzz-0.18.0-system-harfbuzz.patch | 31 ----------------- |
16 |
.../files/uharfbuzz-0.23.0-system-harfbuzz.patch | 9 +++++ |
17 |
dev-python/uharfbuzz/uharfbuzz-0.22.0.ebuild | 40 ---------------------- |
18 |
dev-python/uharfbuzz/uharfbuzz-0.23.0.ebuild | 7 +--- |
19 |
5 files changed, 10 insertions(+), 78 deletions(-) |
20 |
|
21 |
diff --git a/dev-python/uharfbuzz/Manifest b/dev-python/uharfbuzz/Manifest |
22 |
index 363502631..75a0e506a 100644 |
23 |
--- a/dev-python/uharfbuzz/Manifest |
24 |
+++ b/dev-python/uharfbuzz/Manifest |
25 |
@@ -1,2 +1 @@ |
26 |
-DIST uharfbuzz-0.22.0.tar.gz 34454 BLAKE2B 32bbb07f94ed532cfd153bac8164c0444cae9ff0b0d5af870a7e656cf7493926b8c78f868e70e111df9f4286a4779872be5430e020e59527e92843365cb42eb9 SHA512 c30b7d6f4981defd88cda4c178adbab31262bcedd9ccc0969ae1b7bee02b4846e69cecd33ab240af84581d1a34d54167fd8603ade7403f898cf03b4936287792 |
27 |
DIST uharfbuzz-0.23.0.tar.gz 36287 BLAKE2B 6f03aa991d53b6fe093879a0cb5d09b5065ad4fb31453f74323f540aadcdace2430ccdc0a466cddc43a356bb1dd62f066537074a208c1b56d51d43c4eb2062ee SHA512 8cacb54a3d48db29f025bd9eb72133e9a11cf61f6b8064cb91c5399e875e7b46f592bb3c4b284741a161f534bea5771f9c471489c8082ee768953b5948ee2c09 |
28 |
|
29 |
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 |
30 |
deleted file mode 100644 |
31 |
index 93f0c7058..000000000 |
32 |
--- a/dev-python/uharfbuzz/files/uharfbuzz-0.18.0-system-harfbuzz.patch |
33 |
+++ /dev/null |
34 |
@@ -1,31 +0,0 @@ |
35 |
---- a/setup.py |
36 |
-+++ b/setup.py |
37 |
-@@ -13,7 +13,7 @@ |
38 |
- with open(os.path.join(here, 'README.md'), encoding='utf-8') as f: |
39 |
- long_description = f.read() |
40 |
- |
41 |
--define_macros = [('HB_NO_MT', '1'), ('HB_EXPERIMENTAL_API', '1')] |
42 |
-+define_macros = [('HB_EXPERIMENTAL_API', '1')] |
43 |
- linetrace = False |
44 |
- if int(os.environ.get('CYTHON_LINETRACE', '0')): |
45 |
- linetrace = True |
46 |
-@@ -21,7 +21,7 @@ |
47 |
- |
48 |
- extra_compile_args = [] |
49 |
- extra_link_args = [] |
50 |
--libraries = [] |
51 |
-+libraries=['harfbuzz'] |
52 |
- if platform.system() != 'Windows': |
53 |
- extra_compile_args.append('-std=c++11') |
54 |
- define_macros.append(('HAVE_MMAP', '1')) |
55 |
-@@ -39,8 +39,8 @@ |
56 |
- extension = Extension( |
57 |
- 'uharfbuzz._harfbuzz', |
58 |
- define_macros=define_macros, |
59 |
-- include_dirs=['harfbuzz/src'], |
60 |
-- sources=['src/uharfbuzz/_harfbuzz.pyx', 'harfbuzz/src/harfbuzz.cc'], |
61 |
-+ include_dirs=['/usr/include/harfbuzz'], |
62 |
-+ sources=['src/uharfbuzz/_harfbuzz.pyx'], |
63 |
- language='c++', |
64 |
- libraries=libraries, |
65 |
- extra_compile_args=extra_compile_args, |
66 |
|
67 |
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 |
68 |
index 08b9f6549..7d6d0829b 100644 |
69 |
--- a/dev-python/uharfbuzz/files/uharfbuzz-0.23.0-system-harfbuzz.patch |
70 |
+++ b/dev-python/uharfbuzz/files/uharfbuzz-0.23.0-system-harfbuzz.patch |
71 |
@@ -9,6 +9,15 @@ |
72 |
linetrace = False |
73 |
if int(os.environ.get('CYTHON_LINETRACE', '0')): |
74 |
linetrace = True |
75 |
+@@ -21,7 +21,7 @@ |
76 |
+ |
77 |
+ extra_compile_args = [] |
78 |
+ extra_link_args = [] |
79 |
+-libraries = [] |
80 |
++libraries = ['harfbuzz'] |
81 |
+ if platform.system() != 'Windows': |
82 |
+ extra_compile_args.append('-std=c++11') |
83 |
+ define_macros.append(('HAVE_MMAP', '1')) |
84 |
@@ -39,11 +39,9 @@ |
85 |
extension = Extension( |
86 |
'uharfbuzz._harfbuzz', |
87 |
|
88 |
diff --git a/dev-python/uharfbuzz/uharfbuzz-0.22.0.ebuild b/dev-python/uharfbuzz/uharfbuzz-0.22.0.ebuild |
89 |
deleted file mode 100644 |
90 |
index 90c61b347..000000000 |
91 |
--- a/dev-python/uharfbuzz/uharfbuzz-0.22.0.ebuild |
92 |
+++ /dev/null |
93 |
@@ -1,40 +0,0 @@ |
94 |
-# Copyright 1999-2022 Gentoo Authors |
95 |
-# Distributed under the terms of the GNU General Public License v2 |
96 |
- |
97 |
-EAPI=8 |
98 |
- |
99 |
-DISTUTILS_USE_PEP517=setuptools |
100 |
-PYTHON_COMPAT=( python3_{8..10} pypy3 ) |
101 |
- |
102 |
-inherit distutils-r1 |
103 |
- |
104 |
-DESCRIPTION="Streamlined Cython bindings for the HarfBuzz shaping engine" |
105 |
-HOMEPAGE="https://github.com/harfbuzz/uharfbuzz" |
106 |
-SRC_URI="https://github.com/harfbuzz/uharfbuzz/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz" |
107 |
- |
108 |
-KEYWORDS="~amd64" |
109 |
-LICENSE="Apache-2.0" |
110 |
-SLOT="0" |
111 |
- |
112 |
-RDEPEND=">=media-libs/harfbuzz-2.8.1[experimental(-)]" |
113 |
-DEPEND=" |
114 |
- ${RDEPEND} |
115 |
- >=dev-python/cython-0.28.1[${PYTHON_USEDEP}] |
116 |
- >=dev-python/setuptools_scm-2.1[${PYTHON_USEDEP}] |
117 |
- >=dev-python/wheel-0.31[${PYTHON_USEDEP}] |
118 |
-" |
119 |
- |
120 |
-PATCHES=( "${FILESDIR}/${PN}-0.18.0-system-harfbuzz.patch" ) |
121 |
- |
122 |
-distutils_enable_tests pytest |
123 |
- |
124 |
-python_prepare_all() { |
125 |
- distutils-r1_python_prepare_all |
126 |
- export SETUPTOOLS_SCM_PRETEND_VERSION="${PV%_*}" |
127 |
- export USE_SYSTEM_HARFBUZZ=1 |
128 |
-} |
129 |
- |
130 |
-python_install() { |
131 |
- distutils-r1_python_install |
132 |
- python_optimize "$(python_get_sitedir)/${PN}" |
133 |
-} |
134 |
|
135 |
diff --git a/dev-python/uharfbuzz/uharfbuzz-0.23.0.ebuild b/dev-python/uharfbuzz/uharfbuzz-0.23.0.ebuild |
136 |
index 878a48110..ab42fdcba 100644 |
137 |
--- a/dev-python/uharfbuzz/uharfbuzz-0.23.0.ebuild |
138 |
+++ b/dev-python/uharfbuzz/uharfbuzz-0.23.0.ebuild |
139 |
@@ -16,7 +16,7 @@ KEYWORDS="~amd64" |
140 |
LICENSE="Apache-2.0" |
141 |
SLOT="0" |
142 |
|
143 |
-RDEPEND=">=media-libs/harfbuzz-2.8.1[experimental(-)]" |
144 |
+RDEPEND=">=media-libs/harfbuzz-4.0.0[experimental(-)]" |
145 |
DEPEND=" |
146 |
${RDEPEND} |
147 |
>=dev-python/cython-0.28.1[${PYTHON_USEDEP}] |
148 |
@@ -33,8 +33,3 @@ python_prepare_all() { |
149 |
export SETUPTOOLS_SCM_PRETEND_VERSION="${PV%_*}" |
150 |
export USE_SYSTEM_HARFBUZZ=1 |
151 |
} |
152 |
- |
153 |
-python_install() { |
154 |
- distutils-r1_python_install |
155 |
- python_optimize "$(python_get_sitedir)/${PN}" |
156 |
-} |