commit: d0561436959182dc1b04f68822647e637a6f927f
Author: Alessandro Barbieri gmail com>
AuthorDate: Tue Mar 29 08:41:10 2022 +
Commit: Alessandro Barbieri gmail com>
CommitDate: Tue Mar 29 08:44:51 2022 +
URL:https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=d0561436
dev-python/uharfbuzz: fix patch, no optimize
Closes: https://bugs.gentoo.org/835473
Closes: https://bugs.gentoo.org/836356
Signed-off-by: Alessandro Barbieri gmail.com>
dev-python/uharfbuzz/Manifest | 1 -
.../files/uharfbuzz-0.18.0-system-harfbuzz.patch | 31 -
.../files/uharfbuzz-0.23.0-system-harfbuzz.patch | 9 +
dev-python/uharfbuzz/uharfbuzz-0.22.0.ebuild | 40 --
dev-python/uharfbuzz/uharfbuzz-0.23.0.ebuild | 7 +---
5 files changed, 10 insertions(+), 78 deletions(-)
diff --git a/dev-python/uharfbuzz/Manifest b/dev-python/uharfbuzz/Manifest
index 363502631..75a0e506a 100644
--- a/dev-python/uharfbuzz/Manifest
+++ b/dev-python/uharfbuzz/Manifest
@@ -1,2 +1 @@
-DIST uharfbuzz-0.22.0.tar.gz 34454 BLAKE2B
32bbb07f94ed532cfd153bac8164c0444cae9ff0b0d5af870a7e656cf7493926b8c78f868e70e111df9f4286a4779872be5430e020e59527e92843365cb42eb9
SHA512
c30b7d6f4981defd88cda4c178adbab31262bcedd9ccc0969ae1b7bee02b4846e69cecd33ab240af84581d1a34d54167fd8603ade7403f898cf03b4936287792
DIST uharfbuzz-0.23.0.tar.gz 36287 BLAKE2B
6f03aa991d53b6fe093879a0cb5d09b5065ad4fb31453f74323f540aadcdace2430ccdc0a466cddc43a356bb1dd62f066537074a208c1b56d51d43c4eb2062ee
SHA512
8cacb54a3d48db29f025bd9eb72133e9a11cf61f6b8064cb91c5399e875e7b46f592bb3c4b284741a161f534bea5771f9c471489c8082ee768953b5948ee2c09
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
deleted file mode 100644
index 93f0c7058..0
--- a/dev-python/uharfbuzz/files/uharfbuzz-0.18.0-system-harfbuzz.patch
+++ /dev/null
@@ -1,31 +0,0 @@
a/setup.py
-+++ b/setup.py
-@@ -13,7 +13,7 @@
- with open(os.path.join(here, 'README.md'), encoding='utf-8') as f:
- long_description = f.read()
-
--define_macros = [('HB_NO_MT', '1'), ('HB_EXPERIMENTAL_API', '1')]
-+define_macros = [('HB_EXPERIMENTAL_API', '1')]
- linetrace = False
- if int(os.environ.get('CYTHON_LINETRACE', '0')):
- linetrace = True
-@@ -21,7 +21,7 @@
-
- extra_compile_args = []
- extra_link_args = []
--libraries = []
-+libraries=['harfbuzz']
- if platform.system() != 'Windows':
- extra_compile_args.append('-std=c++11')
- define_macros.append(('HAVE_MMAP', '1'))
-@@ -39,8 +39,8 @@
- extension = Extension(
- 'uharfbuzz._harfbuzz',
- define_macros=define_macros,
--include_dirs=['harfbuzz/src'],
--sources=['src/uharfbuzz/_harfbuzz.pyx', 'harfbuzz/src/harfbuzz.cc'],
-+include_dirs=['/usr/include/harfbuzz'],
-+sources=['src/uharfbuzz/_harfbuzz.pyx'],
- language='c++',
- libraries=libraries,
- extra_compile_args=extra_compile_args,
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
index 08b9f6549..7d6d0829b 100644
--- a/dev-python/uharfbuzz/files/uharfbuzz-0.23.0-system-harfbuzz.patch
+++ b/dev-python/uharfbuzz/files/uharfbuzz-0.23.0-system-harfbuzz.patch
@@ -9,6 +9,15 @@
linetrace = False
if int(os.environ.get('CYTHON_LINETRACE', '0')):
linetrace = True
+@@ -21,7 +21,7 @@
+
+ extra_compile_args = []
+ extra_link_args = []
+-libraries = []
++libraries = ['harfbuzz']
+ if platform.system() != 'Windows':
+ extra_compile_args.append('-std=c++11')
+ define_macros.append(('HAVE_MMAP', '1'))
@@ -39,11 +39,9 @@
extension = Extension(
'uharfbuzz._harfbuzz',
diff --git a/dev-python/uharfbuzz/uharfbuzz-0.22.0.ebuild
b/dev-python/uharfbuzz/uharfbuzz-0.22.0.ebuild
deleted file mode 100644
index 90c61b347..0
--- a/dev-python/uharfbuzz/uharfbuzz-0.22.0.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8..10} pypy3 )
-
-inherit distutils-r1
-
-DESCRIPTION="Streamlined Cython bindings for the HarfBuzz shaping engine"
-HOMEPAGE="https://github.com/harfbuzz/uharfbuzz;
-SRC_URI="https://github.com/harfbuzz/uharfbuzz/archive/refs/tags/v${PV}.tar.gz
-> ${P}.tar.gz"
-
-KEYWORDS="~amd64"
-LICENSE="Apache-2.0"
-SLOT="0"
-
-RDEPEND=">=media-libs/harfbuzz-2.8.1[experimental(-)]"
-DEPEND="
- ${RDEPEND}
- >=dev-python/cython-0.28.1[${PYTHON_USEDEP}]
- >=dev-python/setuptools_scm-2.1[${PYTHON_USEDEP}]
- >=dev-python/wheel-0.31[${PYTHON_USEDEP}]
-"
-
-PATCHES=( "${FILESDIR}/${PN}-0.18.0-system-harfbuzz.patch" )
-
-distutils_enable_tests pytest
-
-python_prepare_all() {
- distutils-r1_python_prepare_all
- export SETUPTOOLS_SCM_PRETEND_VERSION="${PV%_*}"
- export
