commit: 73d7896e2f6ce064b2d20f603484d2b06eab51a1 Author: Michał Górny <mgorny <AT> gentoo <DOT> org> AuthorDate: Mon Mar 28 08:53:58 2022 +0000 Commit: Michał Górny <mgorny <AT> gentoo <DOT> org> CommitDate: Mon Mar 28 08:54:57 2022 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=73d7896e
dev-python/reportlab: Disable broken freetype2 finding logic Closes: https://bugs.gentoo.org/836301 Signed-off-by: Michał Górny <mgorny <AT> gentoo.org> .../reportlab/files/reportlab-3.6.9-paths.patch | 21 +++++++++++++++++++++ dev-python/reportlab/reportlab-3.6.9.ebuild | 4 ++++ profiles/package.mask | 7 ------- 3 files changed, 25 insertions(+), 7 deletions(-) diff --git a/dev-python/reportlab/files/reportlab-3.6.9-paths.patch b/dev-python/reportlab/files/reportlab-3.6.9-paths.patch new file mode 100644 index 000000000000..e5ed7c43478d --- /dev/null +++ b/dev-python/reportlab/files/reportlab-3.6.9-paths.patch @@ -0,0 +1,21 @@ +Disable broken logic for finding freetype2 that hits symlink loops. + +diff -dupr reportlab-3.6.9.orig/setup.py reportlab-3.6.9/setup.py +--- reportlab-3.6.9.orig/setup.py 2022-03-28 10:13:33.892516135 +0200 ++++ reportlab-3.6.9/setup.py 2022-03-28 10:49:11.048573739 +0200 +@@ -737,13 +737,10 @@ def main(): + else: + FT_LIB=FT_LIB_DIR=FT_INC_DIR=FT_MACROS=[] + else: +- ftv, I, L = inc_lib_dirs('freetype') + FT_LIB=['freetype'] +- FT_LIB_DIR=L +- FT_INC_DIR=I ++ FT_LIB_DIR=[] ++ FT_INC_DIR=['/usr/include/freetype2'] + FT_MACROS = [('RENDERPM_FT',None)] +- infoline('installing with freetype version %s' % ftv) +- infoline('FT_LIB_DIR=%r FT_INC_DIR=%r' % (FT_LIB_DIR,FT_INC_DIR)) + if not FT_LIB: + infoline('# installing without freetype no ttf, sorry!') + infoline('# You need to install a static library version of the freetype2 software') diff --git a/dev-python/reportlab/reportlab-3.6.9.ebuild b/dev-python/reportlab/reportlab-3.6.9.ebuild index 8381872bec16..a78215c6e3bf 100644 --- a/dev-python/reportlab/reportlab-3.6.9.ebuild +++ b/dev-python/reportlab/reportlab-3.6.9.ebuild @@ -33,6 +33,10 @@ BDEPEND=" app-arch/unzip " +PATCHES=( + "${FILESDIR}"/reportlab-3.6.9-paths.patch +) + distutils_enable_sphinx docs/source src_unpack() { diff --git a/profiles/package.mask b/profiles/package.mask index c8c8023fb8e8..ca933b566b3f 100644 --- a/profiles/package.mask +++ b/profiles/package.mask @@ -33,13 +33,6 @@ #--- END OF EXAMPLES --- -# Sam James <s...@gentoo.org> (2022-03-28) -# Hangs in src_compile when net-libs/nodejs is installed -# Masked pending either a workaround in reportlab or -# adaptations to nodejs. -# bug #836301 -=dev-python/reportlab-3.6.9 - # Matt Turner <matts...@gentoo.org> (2022-03-27) # Dead package. No reverse dependencies. # Removal on 2022-04-27
